summaryrefslogtreecommitdiff
path: root/src/Compositor.cpp
diff options
context:
space:
mode:
authorVaxry <vaxry@vaxry.net>2024-04-06 14:59:30 +0100
committerVaxry <vaxry@vaxry.net>2024-04-06 14:59:30 +0100
commit159444c45b6fa87d250cf694233ce0213a4585bd (patch)
tree5ab690f926541ce33c0b6017c2712c44403dd586 /src/Compositor.cpp
parentf8c22916ab369e13f027b717fa1e505337ec8fd4 (diff)
compositor: fix ghost fadingOut windows remaining after cleanup
Diffstat (limited to 'src/Compositor.cpp')
-rw-r--r--src/Compositor.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 676247a2..cdd1d15b 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -1419,19 +1419,14 @@ void CCompositor::cleanupFadingOut(const int& monid) {
if (w->m_iMonitorID != (long unsigned int)monid)
continue;
- bool valid = windowExists(w);
+ if (!w->m_bFadingOut || w->m_fAlpha.value() == 0.f) {
- if (!valid || !w->m_bFadingOut || w->m_fAlpha.value() == 0.f) {
- if (valid) {
- w->m_bFadingOut = false;
+ w->m_bFadingOut = false;
- if (!w->m_bReadyToDelete)
- continue;
-
- removeWindowFromVectorSafe(w);
- }
+ if (!w->m_bReadyToDelete)
+ continue;
- std::erase(m_vWindowsFadingOut, w);
+ removeWindowFromVectorSafe(w);
Debug::log(LOG, "Cleanup: destroyed a window");
return;