X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fscreen.c;h=852e57fc14a3011eeb2c3ceb503b9739fe46f580;hb=c0c06e3828981cacc96b27a87d7803f603241d15;hp=334e1226fdd19bd829e7fb33a142f71b651f5f8f;hpb=8529aab619c0f26a79cd49ec0f8910433a541263;p=chaz%2Fopenbox

diff --git a/openbox/screen.c b/openbox/screen.c
index 334e1226..852e57fc 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -700,15 +700,17 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
         d = translate_row_col(r, c);
     }
 
-    popup_cycle(d, TRUE);
-    return d;
+    if (config_desktop_popup) {
+        popup_cycle(d, TRUE);
+        return d;
+    }
 
 done_cycle:
     first = TRUE;
 
     popup_cycle(0, FALSE);
 
-    return d = screen_desktop;
+    return d;
 }
 
 void screen_update_layout()