merge r6293 from trunk

diff --git a/openbox/screen.c b/openbox/screen.c
index a5906d25235e3aac31095a331f9b1599c8e0c9e5..9b6a977e11f2086f9c4a64008d91af73f0df4ed0 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -659,11 +659,12 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
     static guint d = (guint)-1;
     guint ret;
 
+    if (d == (guint)-1)
+        d = screen_desktop;
+
     if ((cancel || done) && dialog)
         goto show_cycle_dialog;
 
-    if (d == (guint)-1)
-        d = screen_desktop;
     get_row_col(d, &r, &c);
 
     if (linear) {