koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

attach_to_workspace: set new parent before tree_render

Browse Source 
on_remove_child calls tree_close_internal which calls tree_render and
the tree is in an invalid state if con->parent still points to the old
parent.

Fixes #3556
This commit is contained in:
Orestis Floros
2018-12-12 19:09:39 +02:00
parent 376833db45
commit 605b6ba00f
2 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/move.c
View File

@ -178,9 +178,7 @@ void insert_con_into(Con *con, Con *target, position_t position) {
*/
static void attach_to_workspace(Con *con, Con *ws, direction_t direction) {
con_detach(con);
con_fix_percent(con->parent);
CALL(con->parent, on_remove_child);
Con *old_parent = con->parent;
con->parent = ws;
if (direction == D_RIGHT || direction == D_DOWN) {
@ -195,6 +193,9 @@ static void attach_to_workspace(Con *con, Con *ws, direction_t direction) {
* does not make sense anyways. */
con->percent = 0.0;
con_fix_percent(ws);
con_fix_percent(old_parent);
CALL(old_parent, on_remove_child);
}
/*