From: Dana Jansens <danakj@orodu.net>
Date: Sat, 27 Sep 2003 05:57:08 +0000 (+0000)
Subject: fix cancelling desktordir actions
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=bc1148f0b304dc74736d124696cdede969c3b739;p=chaz%2Fopenbox

fix cancelling desktordir actions
---

diff --git a/openbox/action.c b/openbox/action.c
index 82831ed1..870e8f76 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -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)