add an option for if the popup is used for desktop cycling. defaults on.

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 334e1226fdd19bd829e7fb33a142f71b651f5f8f..8835c1b212b9ee83ad194b339c03a39987cbc17e 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -700,7 +700,8 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
         d = translate_row_col(r, c);
     }
 
-    popup_cycle(d, TRUE);
+    if (config_desktop_popup)
+        popup_cycle(d, TRUE);
     return d;
 
 done_cycle:
@@ -708,7 +709,7 @@ done_cycle:
 
     popup_cycle(0, FALSE);
 
-    return d = screen_desktop;
+    return d;
 }
 
 void screen_update_layout()