X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=767f8c115d213e1c25f85c5024b0dd0f8ee40eeb;hb=e30ae5696f06b11a09355abae2e4eccf51292a88;hp=82831ed122b0c213b4436236e9f0485e12d16869;hpb=598bf575c83a7ebc1be9029d70ea4197ced39d99;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index 82831ed1..767f8c11 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1234,7 +1234,7 @@ void action_desktop(union ActionData *data)
         screen_set_desktop(first);
     }
 
-    if (data->inter.any.interactive && data->inter.final) {
+    if (!data->inter.any.interactive || data->inter.final) {
         screen_desktop_popup(0, FALSE);
         first = (unsigned) -1;
     }
@@ -1251,7 +1251,8 @@ void action_desktop_dir(union ActionData *data)
                              data->desktopdir.inter.final,
                              data->desktopdir.inter.cancel);
     if (!data->sendtodir.inter.any.interactive ||
-        !data->sendtodir.inter.final)
+        !data->sendtodir.inter.final ||
+        data->sendtodir.inter.cancel)
     {
         screen_set_desktop(d);
     }
@@ -1270,7 +1271,8 @@ void action_send_to_desktop_dir(union ActionData *data)
                              data->sendtodir.inter.final,
                              data->sendtodir.inter.cancel);
     if (!data->sendtodir.inter.any.interactive ||
-        !data->sendtodir.inter.final)
+        !data->sendtodir.inter.final ||
+        data->sendtodir.inter.cancel)
     {
         client_set_desktop(c, d, data->sendtodir.follow);
         if (data->sendtodir.follow)