hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-17 05:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

layersurface: don't unref from monitor until dtor

Browse source 
reee
This commit is contained in:
Vaxry 2024-08-24 15:22:10 +02:00
parent 688fe5c147
commit e45e606fbd
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/desktop/LayerSurface.cpp
View file

@ -71,6 +71,12 @@ CLayerSurface::~CLayerSurface() {
surface->unassign(); surface->unassign();
g_pHyprRenderer->makeEGLCurrent(); g_pHyprRenderer->makeEGLCurrent();
std::erase_if(g_pHyprOpenGL->m_mLayerFramebuffers, [&](const auto& other) { return other.first.expired() || other.first.lock() == self.lock(); }); std::erase_if(g_pHyprOpenGL->m_mLayerFramebuffers, [&](const auto& other) { return other.first.expired() || other.first.lock() == self.lock(); });
for (auto& mon : g_pCompositor->m_vRealMonitors) {
for (auto& lsl : mon->m_aLayerSurfaceLayers) {
std::erase_if(lsl, [this](auto& ls) { return ls.expired() || ls.get() == this; });
}
}
} }
void CLayerSurface::onDestroy() { void CLayerSurface::onDestroy() {
@ -107,12 +113,6 @@ void CLayerSurface::onDestroy() {
g_pHyprRenderer->damageBox(&geomFixed); g_pHyprRenderer->damageBox(&geomFixed);
} }
for (auto& mon : g_pCompositor->m_vRealMonitors) {
for (auto& lsl : mon->m_aLayerSurfaceLayers) {
std::erase_if(lsl, [this](auto& ls) { return ls.expired() || ls.get() == this; });
}
}
readyToDelete = true; readyToDelete = true;
layerSurface.reset(); layerSurface.reset();
if (surface) if (surface)