[Xfce4-commits] r23341 - xfce4-panel/trunk/panel

[Jasper Huijsmans]

Author: jasper
Date: 2006-10-10 20:18:42 +0000 (Tue, 10 Oct 2006)
New Revision: 23341

Modified:
   xfce4-panel/trunk/panel/panel-app.c
Log:
Be a little more careful when saving that we still have a valid configuration. Maybe fixes bug #2405.

Modified: xfce4-panel/trunk/panel/panel-app.c
===================================================================
--- xfce4-panel/trunk/panel/panel-app.c	2006-10-10 19:47:50 UTC (rev 23340)
+++ xfce4-panel/trunk/panel/panel-app.c	2006-10-10 20:18:42 UTC (rev 23341)
@@ -110,7 +110,7 @@
 
     GList *dialogs;
 
-    guint initialized:1;
+    guint initialized:1; /* also unset before cleanup */
 
     /* check whether monitors in Xinerama are aligned */
     guint xinerama_and_equal_width:1;
@@ -129,6 +129,11 @@
     int i;
     GList *l;
 
+    if (!panel_app.initialized)
+        return;
+
+    panel_app.initialized = FALSE;
+
     l = panel_app.dialogs;
     panel_app.dialogs = NULL;
     
@@ -776,6 +781,9 @@
 void 
 panel_app_save (void)
 {
+    if (!panel_app.initialized)
+        return;
+
     if (xfce_allow_panel_customization())
         panel_config_save_panels (panel_app.panel_list);
 }
@@ -790,7 +798,6 @@
 void 
 panel_app_quit (void)
 {
-    panel_app_save();
     panel_app.runstate = PANEL_RUN_STATE_QUIT;
     check_signal_state ();
 }