From: Dana Jansens <danakj@orodu.net>
Date: Thu, 10 May 2007 16:18:13 +0000 (+0000)
Subject: merge r6293 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~111
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=1c2cfc1480a590ef6ac77812ea58eb5be0825961;p=dana%2Fopenbox-history.git

merge r6293 from trunk
---

diff --git a/openbox/screen.c b/openbox/screen.c
index a5906d25..9b6a977e 100644
--- 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) {