From 4c60d9df70c67b1d74388c69b46374e46371ff1f Mon Sep 17 00:00:00 2001
From: justin4046 <71111866+justin4046@users.noreply.github.com>
Date: Thu, 5 Mar 2026 09:14:05 -0600
Subject: desktop/rules: fix empty workspace handling (#13544)

---
 src/desktop/view/Window.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/desktop/view/Window.cpp')

diff --git a/src/desktop/view/Window.cpp b/src/desktop/view/Window.cpp
index ea2b9526..abf4da95 100644
--- a/src/desktop/view/Window.cpp
+++ b/src/desktop/view/Window.cpp
@@ -1871,11 +1871,12 @@ void CWindow::mapWindow() {
         if (WORKSPACEARGS.contains("silent"))
             workspaceSilent = true;
 
-        if (WORKSPACEARGS.contains("empty") && PWORKSPACE->getWindows() <= 1) {
+        auto joined = WORKSPACEARGS.join(" ", 0, workspaceSilent ? WORKSPACEARGS.size() - 1 : 0);
+        if (joined.starts_with("empty") && PWORKSPACE->getWindows() == 0) {
             requestedWorkspaceID   = PWORKSPACE->m_id;
             requestedWorkspaceName = PWORKSPACE->m_name;
         } else {
-            auto result            = getWorkspaceIDNameFromString(WORKSPACEARGS.join(" ", 0, workspaceSilent ? WORKSPACEARGS.size() - 1 : 0));
+            auto result            = getWorkspaceIDNameFromString(joined);
             requestedWorkspaceID   = result.id;
             requestedWorkspaceName = result.name;
         }
-- 
cgit v1.2.3