From b0dedddce9f18a6b109d9afe650f029d71ba93c2 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Thu, 10 Mar 2022 13:06:20 +0100
Subject: [PATCH] actually remove on unmap but only non-docks

---
 src/events/events.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/events/events.cpp b/src/events/events.cpp
index 49953df..b1d396b 100644
--- a/src/events/events.cpp
+++ b/src/events/events.cpp
@@ -160,8 +160,14 @@ void Events::eventUnmapWindow(xcb_generic_event_t* event) {
 
     Debug::log(LOG, "Unmap called on " + std::to_string(E->window) + " -> " + PCLOSEDWINDOW->getName());
 
+    if (!PCLOSEDWINDOW->getDock())
+        g_pWindowManager->closeWindowAllChecks(E->window);
+
     // refocus on new window
     g_pWindowManager->refocusWindowOnClosed();
+
+    // EWMH
+    EWMH::updateClientList();
 }
 
 CWindow* Events::remapFloatingWindow(int windowID, int forcemonitor) {