Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 20:44:56 +00:00
Code Issues Releases Activity

clean up code a bit

Browse Source
This commit is contained in:
Nikolas Garofil 2010-11-19 15:52:21 +01:00
parent 63e493d3bb
commit 559d4ebb53
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/conky.cc
View File

@ -2650,7 +2650,6 @@ void load_config_file()
l.loadfile(current_config.c_str());
}
catch(lua::syntax_error &e) {
#define THROW_CONF_SYNTAX_ERR throw conky::critical_error(_("syntax error in configfile"))
#ifdef BUILD_OLD_CONFIG
l.loadstring(convertconf);
l.call(0, 0);
@ -2669,10 +2668,12 @@ void load_config_file()
try {
l.loadstring(l.tostring(-1).c_str());
}
catch(lua::syntax_error &e) { THROW_CONF_SYNTAX_ERR; }
#else
THROW_CONF_SYNTAX_ERR;
#endif /* BUILD_OLD_CONFIG */
catch(lua::syntax_error &e) {
#endif
throw conky::critical_error(_("syntax error in configfile"));
#ifdef BUILD_OLD_CONFIG
}
#endif
}
catch(lua::file_error &e) { throw conky::critical_error(_("no configfile given")); }
l.call(0, 0);