diff options
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index f66d83d..0c8c3af 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -1158,28 +1158,8 @@ string Fluxbox::getDefaultDataFilename(const char *name) const { | |||
1158 | 1158 | ||
1159 | /// loads resources | 1159 | /// loads resources |
1160 | void Fluxbox::load_rc() { | 1160 | void Fluxbox::load_rc() { |
1161 | _FB_USES_NLS; | ||
1162 | lua::stack_sentry s(*m_l); | ||
1163 | |||
1164 | string dbfile(getRcFilename()); | ||
1165 | 1161 | ||
1166 | try { | 1162 | m_resourcemanager.load(getRcFilename(), DEFAULT_INITFILE); |
1167 | m_l->loadfile(dbfile.c_str()); | ||
1168 | m_l->call(0, 0); | ||
1169 | } | ||
1170 | catch(lua::exception &e) { | ||
1171 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "Failed trying to read rc file")<<":"<<dbfile<<endl; | ||
1172 | cerr<<"Fluxbox: "<<e.what()<<endl; | ||
1173 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFileTrying, "Retrying with", "Retrying rc file loading with (the following file)")<<": "<<DEFAULT_INITFILE<<endl; | ||
1174 | try { | ||
1175 | m_l->loadfile(DEFAULT_INITFILE); | ||
1176 | m_l->call(0, 0); | ||
1177 | } | ||
1178 | catch(lua::exception &e) { | ||
1179 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "")<<": "<<DEFAULT_INITFILE<<endl; | ||
1180 | cerr<<"Fluxbox: "<<e.what()<<endl; | ||
1181 | } | ||
1182 | } | ||
1183 | 1163 | ||
1184 | if (m_rc_menufile->empty()) | 1164 | if (m_rc_menufile->empty()) |
1185 | m_rc_menufile.setDefaultValue(); | 1165 | m_rc_menufile.setDefaultValue(); |