1 files changed, 8 insertions, 6 deletions
diff --git a/src/protocols/core/Output.cpp b/src/protocols/core/Output.cpp
index dd9c3166..9278eb95 100644
--- a/src/protocols/core/Output.cpp
+++ b/src/protocols/core/Output.cpp
@@ -30,7 +30,11 @@ CWLOutputResource::CWLOutputResource(SP<CWlOutput> resource_, PHLMONITOR pMonito
 
     updateState();
 
-    PROTO::compositor->forEachSurface([](SP<CWLSurfaceResource> surf) {
+    const auto PMONITOR = m_monitor.lock();
+    if (!PMONITOR)
+        return;
+
+    PROTO::compositor->forEachSurface([PMONITOR](SP<CWLSurfaceResource> surf) {
         auto HLSurf = Desktop::View::CWLSurface::fromResource(surf);
 
         if (!HLSurf)
@@ -41,12 +45,10 @@ CWLOutputResource::CWLOutputResource(SP<CWlOutput> resource_, PHLMONITOR pMonito
         if (!GEOMETRY.has_value())
             return;
 
-        for (auto& m : g_pCompositor->m_monitors) {
-            if (!m->logicalBox().expand(-4).overlaps(*GEOMETRY))
-                continue;
+        if (!PMONITOR->logicalBox().expand(-4).overlaps(*GEOMETRY))
+            return;
 
-            surf->enter(m);
-        }
+        surf->enter(PMONITOR);
     });
 }