summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-09-27 05:57:08 +0000
committerDana Jansens <danakj@orodu.net>2003-09-27 05:57:08 +0000
commitbc1148f0b304dc74736d124696cdede969c3b739 (patch)
tree436a8e01096b308bb0406c0691106d9b0f2c0317
parent4ae6be577de367a62b7986b9f23c14fed38dcc85 (diff)
fix cancelling desktordir actions
-rw-r--r--openbox/action.c6
1 files changed, 4 insertions, 2 deletions
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)