fix assert happening by combining interactive and non-interactive actions
authorDana Jansens <danakj@orodu.net>
Thu, 10 May 2007 16:17:57 +0000 (16:17 +0000)
committerDana Jansens <danakj@orodu.net>
Thu, 10 May 2007 16:17:57 +0000 (16:17 +0000)
openbox/screen.c

index a5906d2..9b6a977 100644 (file)
@@ -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) {