From 110b8d9557ee3aa89617a9c7e87bd483b4b16edf Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 18 Apr 2014 20:36:56 +0200
Subject: [PATCH] =?utf8?q?Don=E2=80=99t=20overwrite=20existing=20windows?=
 =?utf8?q?=20with=20placeholder=20windows?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This could happen when you appended a layout on a workspace where there
are already other windows.
---
 src/restore_layout.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/restore_layout.c b/src/restore_layout.c
index cdf15517..b68e2679 100644
--- a/src/restore_layout.c
+++ b/src/restore_layout.c
@@ -181,7 +181,8 @@ static void update_placeholder_contents(placeholder_state *state) {
 }
 
 static void open_placeholder_window(Con *con) {
-    if (con_is_leaf(con)) {
+    if (con_is_leaf(con) &&
+        (con->window == NULL || con->window->id == XCB_NONE)) {
         xcb_window_t placeholder = create_window(
                 restore_conn,
                 con->rect,
-- 
2.39.5