From f82fdb012e20c7c24c1f72fc140a9ebe7e58e25c Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Tue, 22 Mar 2022 22:22:59 +0100
Subject: fix dwindle + minor logs and comments

---
 src/events/Windows.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/events/Windows.cpp')

diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp
index af0867a1..f41300fa 100644
--- a/src/events/Windows.cpp
+++ b/src/events/Windows.cpp
@@ -56,7 +56,6 @@ void Events::listener_unmapWindow(wl_listener* listener, void* data) {
         g_pCompositor->m_pLastFocus = nullptr;
 
     PWINDOW->m_bMappedX11 = false;
-    PWINDOW->m_bIsMapped = false;
 
     // remove the fullscreen window status from workspace if we closed it
     const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(PWINDOW->m_iWorkspaceID);
@@ -66,6 +65,9 @@ void Events::listener_unmapWindow(wl_listener* listener, void* data) {
 
     g_pLayoutManager->getCurrentLayout()->onWindowRemoved(PWINDOW);
 
+    // do this after onWindowRemoved because otherwise it'll think the window is invalid
+    PWINDOW->m_bIsMapped = false;
+
     // refocus on a new window
     // TODO: investigate.
     // If a parent window has focus, any popups (XWayland) will be broken (they will disappear instantly)
-- 
cgit v1.2.3