From ec9a72d9fbe8372c4cc4e86966f6b13d178b0bba Mon Sep 17 00:00:00 2001
From: Vaxry <43317083+vaxerski@users.noreply.github.com>
Date: Tue, 23 Sep 2025 21:08:30 +0200
Subject: workspaces: fix persistence with no monitor specified (#11807)

---
 src/Compositor.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/Compositor.cpp')

diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index ce549459..5ea88b11 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -3145,7 +3145,7 @@ void CCompositor::ensurePersistentWorkspacesPresent(const std::vector<SWorkspace
                 continue;
         }
 
-        const auto PMONITOR = getMonitorFromString(rule.monitor);
+        auto PMONITOR = getMonitorFromString(rule.monitor);
 
         if (!rule.monitor.empty() && !PMONITOR)
             continue; // don't do anything yet, as the monitor is not yet present.
@@ -3165,8 +3165,11 @@ void CCompositor::ensurePersistentWorkspacesPresent(const std::vector<SWorkspace
                 continue;
             }
             PWORKSPACE = getWorkspaceByID(id);
+            if (!PMONITOR)
+                PMONITOR = m_lastMonitor.lock();
+
             if (!PWORKSPACE)
-                PWORKSPACE = createNewWorkspace(id, PMONITOR ? PMONITOR->m_id : m_lastMonitor->m_id, wsname, false);
+                PWORKSPACE = createNewWorkspace(id, PMONITOR->m_id, wsname, false);
         }
 
         if (!PMONITOR) {
-- 
cgit v1.2.3