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 4fba8d1..fb5c208 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -1150,28 +1150,8 @@ string Fluxbox::getDefaultDataFilename(const char *name) const { | |||
1150 | 1150 | ||
1151 | /// loads resources | 1151 | /// loads resources |
1152 | void Fluxbox::load_rc() { | 1152 | void Fluxbox::load_rc() { |
1153 | _FB_USES_NLS; | ||
1154 | lua::stack_sentry s(*m_l); | ||
1155 | |||
1156 | string dbfile(getRcFilename()); | ||
1157 | 1153 | ||
1158 | try { | 1154 | m_resourcemanager.load(getRcFilename(), DEFAULT_INITFILE); |
1159 | m_l->loadfile(dbfile.c_str()); | ||
1160 | m_l->call(0, 0); | ||
1161 | } | ||
1162 | catch(lua::exception &e) { | ||
1163 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "Failed trying to read rc file")<<":"<<dbfile<<endl; | ||
1164 | cerr<<"Fluxbox: "<<e.what()<<endl; | ||
1165 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFileTrying, "Retrying with", "Retrying rc file loading with (the following file)")<<": "<<DEFAULT_INITFILE<<endl; | ||
1166 | try { | ||
1167 | m_l->loadfile(DEFAULT_INITFILE); | ||
1168 | m_l->call(0, 0); | ||
1169 | } | ||
1170 | catch(lua::exception &e) { | ||
1171 | cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "")<<": "<<DEFAULT_INITFILE<<endl; | ||
1172 | cerr<<"Fluxbox: "<<e.what()<<endl; | ||
1173 | } | ||
1174 | } | ||
1175 | 1155 | ||
1176 | if (m_rc_menufile->empty()) | 1156 | if (m_rc_menufile->empty()) |
1177 | m_rc_menufile.setDefaultValue(); | 1157 | m_rc_menufile.setDefaultValue(); |