From 3d1a1679604e9de18a46a9a0819daf2044b08fa6 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Thu, 5 Oct 2023 01:31:13 +0100
Subject: [PATCH] wsrules: check for workspace ID matches on numbered
 workspaces

fixes #3494
---
 src/config/ConfigManager.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index 42611be3..b675f6ea 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -1827,7 +1827,10 @@ SMonitorRule CConfigManager::getMonitorRuleFor(const std::string& name, const st
 }
 
 SWorkspaceRule CConfigManager::getWorkspaceRuleFor(CWorkspace* pWorkspace) {
-    const auto IT = std::find_if(m_dWorkspaceRules.begin(), m_dWorkspaceRules.end(), [&](const auto& other) { return other.workspaceName == pWorkspace->m_szName; });
+    const auto WORKSPACEIDSTR = std::to_string(pWorkspace->m_iID);
+    const auto IT             = std::find_if(m_dWorkspaceRules.begin(), m_dWorkspaceRules.end(), [&](const auto& other) {
+        return other.workspaceName == pWorkspace->m_szName || (pWorkspace->m_iID > 0 && WORKSPACEIDSTR == other.workspaceName);
+    });
     if (IT == m_dWorkspaceRules.end())
         return SWorkspaceRule{};
     return *IT;