X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=faf065a12fedd0bf10057a27b7f14a2a43ff0efa;hb=a76ac8205cbfe484a5fee7749daa20ed2b7e8a2b;hp=3a4bab154b5c25c1b4eb20847e58ccd9cd76279d;hpb=912f8eed504c2a49c700b345d4171c3c2cdb0df7;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 3a4bab15..faf065a1 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -1587,9 +1587,8 @@ void action_send_to_desktop(union ActionData *data) if (data->sendto.desk < screen_num_desktops || data->sendto.desk == DESKTOP_ALL) { client_set_desktop(c, data->sendto.desk, data->sendto.follow); - if (data->sendto.follow) - screen_set_desktop(data->sendto.desk, - data->sendto.follow && c == focus_client); + if (data->sendto.follow && data->sendto.desk != screen_desktop) + screen_set_desktop(data->sendto.desk, TRUE); } } @@ -1622,7 +1621,8 @@ void action_desktop_dir(union ActionData *data) if (!data->sendtodir.inter.any.interactive || (data->sendtodir.inter.final && !data->sendtodir.inter.cancel)) { - if (d != screen_desktop) screen_set_desktop(d, TRUE); + if (d != screen_desktop) + screen_set_desktop(d, TRUE); } } @@ -1646,7 +1646,7 @@ void action_send_to_desktop_dir(union ActionData *data) { client_set_desktop(c, d, data->sendtodir.follow); if (data->sendtodir.follow && d != screen_desktop) - screen_set_desktop(d, data->sendtodir.follow && c == focus_client); + screen_set_desktop(d, TRUE); } }