@@ -59,8 +59,6 @@ int panel_autohide_hide_timeout;
 int panel_autohide_height;
 int panel_strut_policy;
 
-Task *task_active;
-Task *task_drag;
 int  max_tick_urgent;
 
 // panel's initial config
@@ -83,8 +81,6 @@ {
 	panel1 = 0;
 	nb_panel = 0;
 	default_icon = NULL;
-	task_active = 0;
-	task_drag = 0;
 	task_dragged = 0;
 	panel_horizontal = 1;
 	panel_position = CENTER;
@@ -125,7 +121,8 @@ if (p->main_win) XDestroyWindow(server.dsp, p->main_win);
 	}
 
 	if (panel1) free(panel1);
-	if (backgrounds) g_array_free(backgrounds, 1);
+	if (backgrounds)
+		g_array_free(backgrounds, 1);
 	if (panel_config.g_task.font_desc) pango_font_description_free(panel_config.g_task.font_desc);
 }
 

@@ -59,8 +59,6 @@ extern int panel_autohide_hide_timeout;
 extern int panel_autohide_height;  // for vertical panels this is of course the width
 extern int panel_strut_policy;
 
-extern Task *task_active;
-extern Task *task_drag;
 extern int  max_tick_urgent;
 
 extern GArray* backgrounds;

@@ -104,7 +104,8 @@ if (server.colormap32) XFreeColormap(server.dsp, server.colormap32);
 	if (server.monitor) {
 		int i;
 		for (i=0; i<server.nb_monitor; ++i)
-			g_strfreev(server.monitor[i].names);
+			if (server.monitor[i].names)
+				g_strfreev(server.monitor[i].names);
 		free(server.monitor);
 	}
 	if (server.gc) XFreeGC(server.dsp, server.gc);
@@ -247,15 +248,6 @@ 
 
 void get_monitors()
 {
-	if (server.monitor) {
-		int i;
-		for (i=0; i<server.nb_monitor; ++i)
-			g_strfreev(server.monitor[i].names);
-		free(server.monitor);
-	}
-	server.nb_monitor = 0;
-	server.monitor = 0;
-
 	int i, j, nbmonitor;
 	if (XineramaIsActive(server.dsp)) {
 		XineramaScreenInfo *info = XineramaQueryScreens(server.dsp, &nbmonitor);
@@ -309,7 +301,8 @@ i++;
 		}
 next:
 		for (j=i; j<server.nb_monitor; ++j)
-			g_strfreev(server.monitor[j].names);
+			if (server.monitor[j].names)
+				g_strfreev(server.monitor[j].names);
 		server.nb_monitor = i;
 		server.monitor = realloc(server.monitor, server.nb_monitor * sizeof(Monitor));
 		qsort(server.monitor, server.nb_monitor, sizeof(Monitor), compareMonitorPos);
@@ -324,6 +317,7 @@ server.monitor = malloc(sizeof(Monitor));
 		server.monitor[0].x = server.monitor[0].y = 0;
 		server.monitor[0].width = DisplayWidth (server.dsp, server.screen);
 		server.monitor[0].height = DisplayHeight (server.dsp, server.screen);
+		server.monitor[0].names = 0;
 	}
 }
 

@@ -39,6 +39,9 @@ contains to every Task* on each panel a pointer (i.e. GPtrArray.len == server.nb_desktop)
 */
 GHashTable* win_to_task_table;
 
+Task *task_active;
+Task *task_drag;
+
 guint win_hash(gconstpointer key) { return (guint)*((Window*)key); }
 gboolean win_compare(gconstpointer a, gconstpointer b) { return (*((Window*)a) == *((Window*)b)); }
 void free_ptr_array(gpointer data) { g_ptr_array_free(data, 1); }
@@ -50,6 +53,9 @@ int i, j;
 
 	if (win_to_task_table == 0)
 		win_to_task_table = g_hash_table_new_full(win_hash, win_compare, free, free_ptr_array);
+
+	task_active = 0;
+	task_drag = 0;
 
 	for (i=0 ; i < nb_panel ; i++) {
 		panel = &panel1[i];

@@ -11,6 +11,9 @@ 
 #include "task.h"
 
 extern GHashTable* win_to_task_table;
+extern Task *task_active;
+extern Task *task_drag;
+
 // tint2 use one taskbar per desktop.
 typedef struct {
 	// always start with area