fix for core protocol rewrite

hyprwm · Jun 8, 2024 · a3ff9df · a3ff9df
1 parent 4e547d8
commit a3ff9df
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/protocols/ForeignToplevelWlr.cpp b/src/protocols/ForeignToplevelWlr.cpp
@@ -37,11 +37,17 @@ CForeignToplevelHandleWlr::CForeignToplevelHandleWlr(SP<CZwlrForeignToplevelHand
             return;
         }
 
-        const auto PMONITOR = output ? g_pCompositor->getMonitorFromOutput(wlr_output_from_resource(output)) : nullptr;
+        if (output) {
+            const auto wpMonitor = CWLOutputResource::fromResource(output)->monitor;
 
-        if (PMONITOR && PWINDOW->m_pWorkspace != PMONITOR->activeWorkspace) {
-            g_pCompositor->moveWindowToWorkspaceSafe(PWINDOW, PMONITOR->activeWorkspace);
-            g_pCompositor->setActiveMonitor(PMONITOR);
+            if (!wpMonitor.expired()) {
+                const auto monitor = wpMonitor.lock();
+
+                if (PWINDOW->m_pWorkspace != monitor->activeWorkspace) {
+                    g_pCompositor->moveWindowToWorkspaceSafe(PWINDOW, monitor->activeWorkspace);
+                    g_pCompositor->setActiveMonitor(monitor.get());
+                }
+            }
         }
 
         g_pCompositor->setWindowFullscreen(PWINDOW, true, FULLSCREEN_FULL);