From b2db9ac797a9b5adc55c17e57b54ca34eaeb57ab Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 26 Nov 2010 20:15:08 +0100
Subject: [PATCH] Bugfix: always reset state->initial to false, not only for
 different stacking order

As initial may be set to true again after initializing the window, we need to
ensure that it is properly cleared. Otherwise, this leads to ghost windows when
unmapping (such as the Xpdf about dialog) due to i3 issuing MapWindow after an
Unmap happened but before i3 actually received/handled the UnmapNotify.
---
 src/x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/x.c b/src/x.c
index c489dca7..192e7b89 100644
--- a/src/x.c
+++ b/src/x.c
@@ -539,7 +539,6 @@ void x_push_changes(Con *con) {
         if (prev != old_prev)
             order_changed = true;
         if ((state->initial || order_changed) && prev != CIRCLEQ_END(&state_head)) {
-            state->initial = false;
             LOG("Stacking 0x%08x above 0x%08x\n", prev->id, state->id);
             uint32_t mask = 0;
             mask |= XCB_CONFIG_WINDOW_SIBLING;
@@ -548,6 +547,7 @@ void x_push_changes(Con *con) {
 
             xcb_configure_window(conn, prev->id, mask, values);
         }
+        state->initial = false;
     }
 
     xcb_window_t to_focus = focused->frame;