From 164e92f8e376536fff89dac41cde654293e64522 Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Thu, 14 Mar 2024 18:25:28 +0000
Subject: internal: minor fixups for fading out xwayland windows

fixes #4935
---
 src/Compositor.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/Compositor.cpp')

diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 4d3fd65b..eda5b5ed 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -1433,11 +1433,15 @@ void CCompositor::cleanupFadingOut(const int& monid) {
         bool valid = windowExists(w);
 
         if (!valid || !w->m_bFadingOut || w->m_fAlpha.value() == 0.f) {
-            if (valid && !w->m_bReadyToDelete)
-                continue;
+            if (valid) {
+                w->m_bFadingOut = false;
+
+                if (!w->m_bReadyToDelete)
+                    continue;
+
+                removeWindowFromVectorSafe(w);
+            }
 
-            w->m_bFadingOut = false;
-            removeWindowFromVectorSafe(w);
             std::erase(m_vWindowsFadingOut, w);
 
             Debug::log(LOG, "Cleanup: destroyed a window");
-- 
cgit v1.2.3