From: Dana Jansens <danakj@orodu.net>
Date: Mon, 8 Sep 2003 03:08:32 +0000 (+0000)
Subject: fix crash when reconfigure changes the stacking layer of the dock
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=7eddc48043272f170bfb44b39dc6c99eb4d9dfa5;p=chaz%2Fopenbox

fix crash when reconfigure changes the stacking layer of the dock
---

diff --git a/openbox/dock.c b/openbox/dock.c
index 1df377b0..7511366d 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -21,6 +21,7 @@ void dock_startup(gboolean reconfig)
     XSetWindowAttributes attrib;
 
     if (reconfig) {
+        stacking_add(DOCK_AS_WINDOW(dock));
         dock_configure();
         return;
     }
@@ -48,12 +49,14 @@ void dock_startup(gboolean reconfig)
 
     g_hash_table_insert(window_map, &dock->frame, dock);
     stacking_add(DOCK_AS_WINDOW(dock));
-    stacking_raise(DOCK_AS_WINDOW(dock));
 }
 
 void dock_shutdown(gboolean reconfig)
 {
-    if (reconfig) return;
+    if (reconfig) {
+        stacking_remove(DOCK_AS_WINDOW(dock));
+        return;
+    }
 
     XDestroyWindow(ob_display, dock->frame);
     RrAppearanceFree(dock->a_frame);