From: Ingo Bürk <ingo.buerk@tngtech.com>
Date: Sun, 27 Dec 2015 23:08:30 +0000 (-0500)
Subject: Move urgent flag before killing the parent.
X-Git-Tag: 4.12~80^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=61a8bc81ecf16182089e07d9c532c4d0e75e1873;p=i3%2Fi3

Move urgent flag before killing the parent.

We need to move the urgent flag when moving a container across
workspaces before calling on_remove_child on the parent in order
to avoid a crash.

fixes #2128
---

diff --git a/src/con.c b/src/con.c
index 64dbec69..66bba864 100644
--- a/src/con.c
+++ b/src/con.c
@@ -1040,14 +1040,14 @@ static bool _con_move_to_con(Con *con, Con *target, bool behind_focused, bool fi
             startup_sequence_delete(sequence);
     }
 
-    CALL(parent, on_remove_child);
-
     /* 9. If the container was marked urgent, move the urgency hint. */
     if (urgent) {
         workspace_update_urgent_flag(source_ws);
         con_set_urgency(con, true);
     }
 
+    CALL(parent, on_remove_child);
+
     ipc_send_window_event("move", con);
     return true;
 }