From 89286cbe839ac2c7a8b1cc122326a4aa19cbb261 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 24 Sep 2003 06:29:09 +0000 Subject: [PATCH] fix problems with conflicing interactive desktop switching and send-to-ing --- openbox/action.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/openbox/action.c b/openbox/action.c index c6e66c35..007073f1 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -1195,7 +1195,11 @@ void action_desktop_dir(union ActionData *data) data->desktopdir.inter.any.interactive, data->desktopdir.inter.final, data->desktopdir.inter.cancel); - screen_set_desktop(d); + if (!data->sendtodir.inter.any.interactive || + !data->sendtodir.inter.final) + { + screen_set_desktop(d); + } } void action_send_to_desktop_dir(union ActionData *data) @@ -1210,9 +1214,13 @@ void action_send_to_desktop_dir(union ActionData *data) data->sendtodir.inter.any.interactive, data->sendtodir.inter.final, data->sendtodir.inter.cancel); - client_set_desktop(c, d, data->sendtodir.follow); - if (data->sendtodir.follow) - screen_set_desktop(d); + if (!data->sendtodir.inter.any.interactive || + !data->sendtodir.inter.final) + { + client_set_desktop(c, d, data->sendtodir.follow); + if (data->sendtodir.follow) + screen_set_desktop(d); + } } void action_desktop_last(union ActionData *data) -- 2.45.2