Merge branch 'master' into next

[i3/i3] / src / con.c

diff --git a/src/con.c b/src/con.c
index 84063ebae9eef627b697ab2bd8d41a8ff911be09..ba14e06c66028083c46da87a16c5f7ed0dc75562 100644 (file)
--- a/src/con.c
+++ b/src/con.c
@@ -1355,8 +1355,9 @@ static void con_on_remove_child(Con *con) {
      * not be closed when the last child was removed */
     if (con->type == CT_OUTPUT ||
         con->type == CT_ROOT ||
-        con->type == CT_DOCKAREA) {
-        DLOG("not handling, type = %d\n", con->type);
+        con->type == CT_DOCKAREA ||
+        (con->parent != NULL && con->parent->type == CT_OUTPUT)) {
+        DLOG("not handling, type = %d, name = %s\n", con->type, con->name);
         return;
     }