workspace: fix emptym

Empty workspaces on other monitors should be ignored.

Fixes #8416

Author: MikeWalrus

src/helpers/MiscFunctions.cpp

@@ -164,10 +164,16 @@ SWorkspaceIDName getWorkspaceIDNameFromString(const std::string& in) {
         WORKSPACEID id = next ? Desktop::focusState()->monitor()->activeWorkspaceID() : 0;
         while (++id < LONG_MAX) {
             const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(id);
-            if (!invalidWSes.contains(id) && (!PWORKSPACE || PWORKSPACE->getWindows() == 0)) {
-                result.id = id;
-                return result;
+            if (invalidWSes.contains(id))
+                continue;
+            if (PWORKSPACE) {
+                if (PWORKSPACE->getWindows())
+                    continue;
+                if (same_mon && PWORKSPACE->m_monitor && PWORKSPACE->m_monitor->m_id != g_pCompositor->m_lastMonitor->m_id)
+                    continue;
             }
+            result.id = id;
+            return result;
         }
     } else if (in.starts_with("prev")) {
         if (!Desktop::focusState()->monitor())