From: Ingo Bürk <admin@airblader.de>
Date: Mon, 29 Oct 2018 13:59:25 +0000 (+0100)
Subject: Merge pull request #3486 from orestisf1993/regress-move-floating
X-Git-Tag: 4.16~3
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=f16afef7b37911f0e0f916792df31f78d60a53aa;hp=04d1fcbe2d3f9937544804fec1d0383ad8e27a05

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 c9ff44a2..21d2f097 100644
--- 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));
         }
     }