Merge branch 'backport' into work

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 3432ac436b490199bdb1e83cb76db2e1f68e12fb..3b9f66ff35a66cce6d06dbfcf4db8e50be855ce1 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -481,7 +481,7 @@ void screen_resize(void)
     OBT_PROP_SETA32(obt_root(ob_screen),
                     NET_DESKTOP_GEOMETRY, CARDINAL, geometry, 2);
 
-    if (ob_state() == OB_STATE_STARTING)
+    if (ob_state() != OB_STATE_RUNNING)
         return;
 
     screen_update_areas();
@@ -710,7 +710,7 @@ void screen_set_desktop(guint num, gboolean dofocus)
     if (event_curtime != CurrentTime)
         screen_desktop_user_time = event_curtime;
 
-    hooks_run(OB_HOOK_SCREEN_DESK_CHANGE, NULL);
+    hooks_queue(OB_HOOK_SCREEN_DESK_CHANGE, NULL);
 }
 
 void screen_add_desktop(gboolean current)