fix crash when reconfigure changes the stacking layer of the dock

[chaz/openbox] / openbox / dock.c

diff --git a/openbox/dock.c b/openbox/dock.c
index 0bb28d4356de4e5bc413e0746dff0ccc2b90ed76..7511366ddc81a999bbdd5897e19220b25837485f 100644 (file)
--- 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);
@@ -351,11 +354,14 @@ void dock_configure()
         strh = ob_rr_theme->bwidth;
     } else {
         strw = dock->w;
-        strh =  dock->h;
+        strh = dock->h;
     }
 
     /* set the strut */
-    if (config_dock_floating) {
+    if (!dock->dock_apps) {
+        STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
+                          0, 0, 0, 0, 0, 0, 0, 0);
+    } else if (config_dock_floating) {
         STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
                           0, 0, 0, 0, 0, 0, 0, 0);
     } else {
@@ -446,7 +452,10 @@ void dock_configure()
     dock->w -= ob_rr_theme->bwidth * 2;
     dock->h -= ob_rr_theme->bwidth * 2;
 
-    if (dock->w > 0 && dock->h > 0) {
+    if (dock->dock_apps) {
+        g_assert(dock->w > 0);
+        g_assert(dock->h > 0);
+
         XMoveResizeWindow(ob_display, dock->frame,
                           dock->x, dock->y, dock->w, dock->h);