diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Compositor.cpp | 11 | ||||
| -rw-r--r-- | src/events/Windows.cpp | 5 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 59843b90..f6f73b42 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -438,7 +438,7 @@ CMonitor* CCompositor::getMonitorFromVector(const Vector2D& point) { void CCompositor::removeWindowFromVectorSafe(CWindow* pWindow) { if (windowExists(pWindow) && !pWindow->m_bFadingOut){ if (pWindow->m_bIsX11 && pWindow->m_iX11Type == 2) { - m_dUnmanagedX11Windows.erase(std::remove_if(m_dUnmanagedX11Windows.begin(), m_dUnmanagedX11Windows.end(), [&](std::unique_ptr<CWindow>& el) { return el.get() == pWindow; })); + std::erase_if(m_dUnmanagedX11Windows, [&](std::unique_ptr<CWindow>& el) { return el.get() == pWindow; }); } // if X11, also check its children @@ -449,16 +449,16 @@ void CCompositor::removeWindowFromVectorSafe(CWindow* pWindow) { continue; if (w->m_pX11Parent == pWindow) - m_vWindows.erase(std::remove_if(m_vWindows.begin(), m_vWindows.end(), [&](std::unique_ptr<CWindow>& el) { return el.get() == w.get(); })); + std::erase_if(m_vWindows, [&](std::unique_ptr<CWindow>& el) { return el.get() == w.get(); }); } for (auto& w : m_dUnmanagedX11Windows) { if (w->m_pX11Parent == pWindow) - m_dUnmanagedX11Windows.erase(std::remove_if(m_dUnmanagedX11Windows.begin(), m_dUnmanagedX11Windows.end(), [&](std::unique_ptr<CWindow>& el) { return el.get() == w.get(); })); + std::erase_if(m_dUnmanagedX11Windows, [&](std::unique_ptr<CWindow>& el) { return el.get() == w.get(); }); } } - m_vWindows.erase(std::remove_if(m_vWindows.begin(), m_vWindows.end(), [&](std::unique_ptr<CWindow>& el) { return el.get() == pWindow; })); + std::erase_if(m_vWindows, [&](std::unique_ptr<CWindow>& el) { return el.get() == pWindow; }); } } @@ -1068,8 +1068,9 @@ void CCompositor::cleanupFadingOut(const int& monid) { g_pHyprOpenGL->m_mWindowFramebuffers[w].release(); g_pHyprOpenGL->m_mWindowFramebuffers.erase(w); + w->m_bFadingOut = false; removeWindowFromVectorSafe(w); - m_vWindowsFadingOut.erase(std::remove(m_vWindowsFadingOut.begin(), m_vWindowsFadingOut.end(), w)); + std::erase(m_vWindowsFadingOut, w); Debug::log(LOG, "Cleanup: destroyed a window"); diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp index 9f44e23c..85115139 100644 --- a/src/events/Windows.cpp +++ b/src/events/Windows.cpp @@ -706,6 +706,11 @@ void Events::listener_destroyWindow(void* owner, void* data) { } PWINDOW->m_bReadyToDelete = true; + + if (!PWINDOW->m_bFadingOut) { + g_pCompositor->removeWindowFromVectorSafe(PWINDOW); // most likely X11 unmanaged or sumn + Debug::log(LOG, "Unmapped window %x removed instantly", PWINDOW); + } } void Events::listener_setTitleWindow(void* owner, void* data) { |