Merge pull request #3486 from orestisf1993/regress-move-floating

Fix regression with moving floating windows

diff --git a/src/con.c b/src/con.c
index c9ff44a2cd484913065b8993b105375de9125e6c..21d2f097af4d667c7ccd0b94afa7d25b209e1cb7 100644 (file)
--- a/src/con.c
+++ b/src/con.c
@@ -1234,14 +1234,12 @@ static bool _con_move_to_con(Con *con, Con *target, bool behind_focused, bool fi
         Con *old_focus = focused;
         con_activate(con_descend_focused(con));
 
-        /* Restore focus if the output's focused workspace has changed. */
-        if (con_get_workspace(focused) != old_focus_ws) {
-            con_focus(old_focus);
-        }
-
-        /* Restore focus to the currently focused container. */
         if (old_focus_ws == current_ws && old_focus->type != CT_WORKSPACE) {
+            /* Restore focus to the currently focused container. */
             con_activate(old_focus);
+        } else if (con_get_workspace(focused) != old_focus_ws) {
+            /* Restore focus if the output's focused workspace has changed. */
+            con_focus(con_descend_focused(old_focus_ws));
         }
     }