Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Code Issues Releases Activity

Bugfix: segfault at config reload

Browse Source
This commit is contained in:
Nikolas Garofil 2010-11-21 14:32:59 +01:00
parent a87c3ee205
commit bce7064cdb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/conky.cc
View File

@ -2469,6 +2469,8 @@ void initialisation(int argc, char** argv);
static void reload_config(void)
{
clean_up(NULL, NULL);
state.reset(new lua::state);
conky::export_symbols(*state);
sleep(1); /* slight pause */
initialisation(argc_copy, argv_copy);
}
@ -2583,11 +2585,10 @@ static void set_default_configurations(void)
info.xmms2.status = NULL;
info.xmms2.playlist = NULL;
#endif /* BUILD_XMMS2 */
#ifdef BUILD_X11
state->pushboolean(true);
#ifdef BUILD_X11
out_to_x.lua_set(*state);
#else
state->pushboolean(true);
out_to_stdout.lua_set(*state);
#endif