aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc22
1 files changed, 1 insertions, 21 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index c4e6559..8ffd9f3 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -1149,28 +1149,8 @@ string Fluxbox::getDefaultDataFilename(const char *name) const {
1149 1149
1150/// loads resources 1150/// loads resources
1151void Fluxbox::load_rc() { 1151void Fluxbox::load_rc() {
1152 _FB_USES_NLS;
1153 lua::stack_sentry s(*m_l);
1154
1155 string dbfile(getRcFilename());
1156 1152
1157 try { 1153 m_resourcemanager.load(getRcFilename(), DEFAULT_INITFILE);
1158 m_l->loadfile(dbfile.c_str());
1159 m_l->call(0, 0);
1160 }
1161 catch(lua::exception &e) {
1162 cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "Failed trying to read rc file")<<":"<<dbfile<<endl;
1163 cerr<<"Fluxbox: "<<e.what()<<endl;
1164 cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFileTrying, "Retrying with", "Retrying rc file loading with (the following file)")<<": "<<DEFAULT_INITFILE<<endl;
1165 try {
1166 m_l->loadfile(DEFAULT_INITFILE);
1167 m_l->call(0, 0);
1168 }
1169 catch(lua::exception &e) {
1170 cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "")<<": "<<DEFAULT_INITFILE<<endl;
1171 cerr<<"Fluxbox: "<<e.what()<<endl;
1172 }
1173 }
1174 1154
1175 if (m_rc_menufile->empty()) 1155 if (m_rc_menufile->empty())
1176 m_rc_menufile.setDefaultValue(); 1156 m_rc_menufile.setDefaultValue();