From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 18 Apr 2014 18:36:56 +0000 (+0200)
Subject: Don’t overwrite existing windows with placeholder windows
X-Git-Tag: 4.8~80
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=110b8d9557ee3aa89617a9c7e87bd483b4b16edf;p=i3%2Fi3

Don’t overwrite existing windows with placeholder windows

This could happen when you appended a layout on a workspace where there
are already other windows.
---

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,