handle modals a bit better

1 files changed, 2 insertions, 2 deletions

diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp
index cafcf1e5..e353dc2f 100644
--- a/src/events/Windows.cpp
+++ b/src/events/Windows.cpp
@@ -22,6 +22,7 @@ void Events::listener_mapWindow(wl_listener* listener, void* data) {
     PWINDOW->m_iMonitorID = PMONITOR->ID;
     PWINDOW->m_bMappedX11 = true;
     PWINDOW->m_iWorkspaceID = PMONITOR->activeWorkspace;
+    PWINDOW->m_bIsMapped = true;
 
     const auto PWINDOWSURFACE = g_pXWaylandManager->getWindowSurface(PWINDOW);
 
@@ -52,6 +53,7 @@ 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);
@@ -61,8 +63,6 @@ void Events::listener_unmapWindow(wl_listener* listener, void* data) {
 
     g_pLayoutManager->getCurrentLayout()->onWindowRemoved(PWINDOW);
 
-    g_pCompositor->removeWindowFromVectorSafe(PWINDOW);
-
     // refocus on a new window
     // TODO: investigate.
     // If a parent window has focus, any popups (XWayland) will be broken (they will disappear instantly)