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

Fix leaks that happen when there is no config available (these are only tiny leaks because conky will shutdown anyway when there is no config available)

Browse Source
This commit is contained in:
Nikolas Garofil 2010-11-21 00:05:20 +01:00
parent c63f42a693
commit 199f8876fb
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/conky.cc
View File

@ -2827,7 +2827,7 @@ void set_current_config() {
current_config = builtin_config_magic;
NORM_ERR(NOCFGFILEFOUND ", using builtin default");
#else
CRIT_ERR(NULL, NULL, NOCFGFILEFOUND);
throw std::runtime_error(NOCFGFILEFOUND);
#endif
}
@ -2841,7 +2841,8 @@ void initialisation(int argc, char **argv) {
set_default_configurations();
set_current_config();
try { set_current_config(); }
catch(std::runtime_error &e) { throw e; }
load_config_file();
/* handle other command line arguments */
@ -3078,7 +3079,11 @@ int main(int argc, char **argv)
}
}
set_current_config();
try { set_current_config(); }
catch(std::runtime_error &e) {
std::cerr << e.what() << std::endl;
return EXIT_FAILURE;
}
state.reset(new lua::state);
try {
@ -3120,6 +3125,10 @@ int main(int argc, char **argv)
std::cerr << e.what() << std::endl;
return EXIT_FAILURE;
}
catch(std::runtime_error &e) {
std::cerr << e.what() << std::endl;
return EXIT_FAILURE;
}
disk_cleanup();