From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 22 Nov 2013 16:09:28 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.7~17
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=1dbdd4fece86c5f85bde54e40f58fa1a91810933;hp=d3beff23395356ec71fcc35a3b802163e12df73e

Merge branch 'master' into next
---

diff --git a/src/con.c b/src/con.c
index 84063eba..ba14e06c 100644
--- 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;
     }