make omnipresent windows not flicker when changing desktops

diff --git a/openbox/action.c b/openbox/action.c
index 4436aec9d2722a6e45429292cd53077ae33357ea..081b68f5293b921d91f1ba94f138cf21dc1fb5af 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1601,7 +1601,7 @@ void action_desktop(union ActionData *data)
     {
         screen_set_desktop(data->desktop.desk, TRUE);
         if (data->inter.any.interactive)
-            screen_desktop_popup(data->desktop.desk, TRUE);
+            screen_desktop_popup(data->desktop.desk, focus_client->desktop != DESKTOP_ALL);
     }
 }
 
@@ -1621,7 +1621,7 @@ void action_desktop_dir(union ActionData *data)
     if (!data->sendtodir.inter.any.interactive ||
         (data->sendtodir.inter.final && !data->sendtodir.inter.cancel))
     {
-        if (d != screen_desktop) screen_set_desktop(d, TRUE);
+        if (d != screen_desktop) screen_set_desktop(d, focus_client->desktop != DESKTOP_ALL);
     }
 }