Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-26 00:28:25 +00:00
Code Issues Releases Activity

re-order things in reload_config()

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@516 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Philip Kovacs 2006-01-27 21:30:56 +00:00
parent 663baa883b
commit bcfd869379
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/conky.c
View File

@ -4549,6 +4549,18 @@ static void load_config_file(const char *);
/* reload the config file */ /* reload the config file */
void reload_config(void) void reload_config(void)
{ {
#if defined(XMMS) || defined(BMP) || defined(AUDACIOUS) || defined(INFOPIPE)
if (info.xmms.thread) {
if (destroy_xmms_thread()!=0)
{
ERR("error destroying xmms_player thread");
}
}
#endif
#ifdef TCP_PORT_MONITOR
destroy_tcp_port_monitor_collection( info.p_tcp_port_monitor_collection );
#endif
if (current_config) { if (current_config) {
clear_fs_stats(); clear_fs_stats();
load_config_file(current_config); load_config_file(current_config);
@ -4559,16 +4571,9 @@ void reload_config(void)
#endif /* X11 */ #endif /* X11 */
#ifdef TCP_PORT_MONITOR #ifdef TCP_PORT_MONITOR
destroy_tcp_port_monitor_collection( info.p_tcp_port_monitor_collection );
info.p_tcp_port_monitor_collection = NULL; info.p_tcp_port_monitor_collection = NULL;
#endif #endif
#if defined(XMMS) || defined(BMP) || defined(AUDACIOUS) || defined(INFOPIPE) #if defined(XMMS) || defined(BMP) || defined(AUDACIOUS) || defined(INFOPIPE)
if (info.xmms.thread) {
if (destroy_xmms_thread()!=0)
{
ERR("error destroying xmms_player thread");
}
}
if ( (!info.xmms.thread) && (info.xmms.current_project > PROJECT_NONE) && if ( (!info.xmms.thread) && (info.xmms.current_project > PROJECT_NONE) &&
(create_xmms_thread() !=0) ) (create_xmms_thread() !=0) )
{ {