con_swap: exit when first _con_move_to_con fails

[i3/i3] / src / con.c

diff --git a/src/con.c b/src/con.c
index deb6555846d05311acd05269a7e84fca53e45bad..b7168d417587583eb0552c6f0eb4dd6ba20fc632 100644 (file)
--- a/src/con.c
+++ b/src/con.c
@@ -2373,6 +2373,10 @@ bool con_swap(Con *first, Con *second) {
 
     /* Move first to second. */
     result &= _con_move_to_con(first, second, false, false, false, true, false);
+    /* If swapping the containers didn't work we don't need to mess with the focus. */
+    if (!result) {
+        goto swap_end;
+    }
 
     /* If we moved the container holding the focused window to another
      * workspace we need to ensure the visible workspace has the focused
@@ -2385,8 +2389,6 @@ bool con_swap(Con *first, Con *second) {
 
     /* Move second to where first has been originally. */
     result &= _con_move_to_con(second, fake, false, false, false, true, false);
-
-    /* If swapping the containers didn't work we don't need to mess with the focus. */
     if (!result) {
         goto swap_end;
     }