From aa6a78f0a4e17c49ed4aff8b58c3f7ec7ef0408f Mon Sep 17 00:00:00 2001
From: Arnaud <arnaudma.code@gmail.com>
Date: Wed, 13 Aug 2025 09:45:34 +0200
Subject: internal: Ensure unique identifiers for persistent workspaces
 (#11409)

---
 src/Compositor.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/Compositor.cpp')

diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 4d0a917b..3b8fb0a5 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -1727,6 +1727,14 @@ WORKSPACEID CCompositor::getNextAvailableNamedWorkspace() {
             lowest = w->m_id;
     }
 
+    // Give priority to persistent workspaces to avoid any conflicts between them.
+    for (auto const& rule : g_pConfigManager->getAllWorkspaceRules()) {
+        if (!rule.isPersistent)
+            continue;
+        if (rule.workspaceId < -1 && rule.workspaceId < lowest)
+            lowest = rule.workspaceId;
+    }
+
     return lowest - 1;
 }
 
-- 
cgit v1.2.3