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
This commit is contained in:
Ingo Bürk 2015-12-27 18:08:30 -05:00
parent dc463077d6
commit 61a8bc81ec

View File

@ -1040,14 +1040,14 @@ static bool _con_move_to_con(Con *con, Con *target, bool behind_focused, bool fi
startup_sequence_delete(sequence); startup_sequence_delete(sequence);
} }
CALL(parent, on_remove_child);
/* 9. If the container was marked urgent, move the urgency hint. */ /* 9. If the container was marked urgent, move the urgency hint. */
if (urgent) { if (urgent) {
workspace_update_urgent_flag(source_ws); workspace_update_urgent_flag(source_ws);
con_set_urgency(con, true); con_set_urgency(con, true);
} }
CALL(parent, on_remove_child);
ipc_send_window_event("move", con); ipc_send_window_event("move", con);
return true; return true;
} }