don't make interactive desktop cycling switch until you release the mods. this is...

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index bcd1b60fd1f05cee66e17e7b6733d38959e11560..5cc0bb213dd44debeefd1c0fc81063ec007b9acb 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1546,8 +1546,7 @@ 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.cancel)
+        (data->sendtodir.inter.final && !data->sendtodir.inter.cancel))
     {
         if (d != screen_desktop) screen_set_desktop(d, TRUE);
     }
@@ -1566,8 +1565,7 @@ 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.cancel)
+        (data->sendtodir.inter.final && !data->sendtodir.inter.cancel))
     {
         client_set_desktop(c, d, data->sendtodir.follow);
         if (data->sendtodir.follow && d != screen_desktop)