don't fallback focus if the focused client is being moved there and follow is on

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index 85d84798ab991e3eb433afbc01f8887d92671d92..3a4bab154b5c25c1b4eb20847e58ccd9cd76279d 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1588,7 +1588,8 @@ void action_send_to_desktop(union ActionData *data)
         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, TRUE);
+            screen_set_desktop(data->sendto.desk,
+                               data->sendto.follow && c == focus_client);
     }
 }
 
@@ -1645,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, TRUE);
+            screen_set_desktop(d, data->sendtodir.follow && c == focus_client);
     }
 }