Bugfix: don’t kill parent when currently in tree_close() for a child of this parent

This commit is contained in:
Michael Stapelberg
2010-11-14 20:14:09 +01:00
parent f0efb3737e
commit d760a1c7b2
6 changed files with 13 additions and 11 deletions

View File

@ -95,7 +95,7 @@ void floating_disable(Con *con, bool automatic) {
/* 2: kill parent container */
TAILQ_REMOVE(&(con->parent->parent->floating_head), con->parent, floating_windows);
TAILQ_REMOVE(&(con->parent->parent->focus_head), con->parent, focused);
tree_close(con->parent, false);
tree_close(con->parent, false, false);
/* 3: re-attach to previous parent */
con->parent = con->old_parent;