Merge branch 'backport' into work

[chaz/openbox] / openbox / actions / desktop.c

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index b50534d1669899038df2588d47ac9d40b40bbd9d..37268bba9900c42d29fb4ffbb450f68168388c9b 100644 (file)
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -136,12 +136,14 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     if (d < screen_num_desktops && d != screen_desktop) {
         gboolean go = TRUE;
 
+        actions_client_move(data, TRUE);
         if (o->send && data->client && client_normal(data->client)) {
             client_set_desktop(data->client, d, o->follow, FALSE);
             go = o->follow;
         }
 
         if (go) screen_set_desktop(d, TRUE);
+        actions_client_move(data, FALSE);
     }
     return FALSE;
 }