summaryrefslogtreecommitdiff
path: root/src/Compositor.cpp
diff options
context:
space:
mode:
authorVaxry <43317083+vaxerski@users.noreply.github.com>2025-09-23 21:08:30 +0200
committerGitHub <noreply@github.com>2025-09-23 21:08:30 +0200
commitec9a72d9fbe8372c4cc4e86966f6b13d178b0bba (patch)
treed88e9b453d5f00f262ce61b4cad7804453a46b97 /src/Compositor.cpp
parent31bd9ec41705a606bb074facca114ea79b62a63a (diff)
workspaces: fix persistence with no monitor specified (#11807)
Diffstat (limited to 'src/Compositor.cpp')
-rw-r--r--src/Compositor.cpp7
1 files changed, 5 insertions, 2 deletions
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) {