782f32e83d7aab9424ebb1ad853c242f7e58950e

Author
Ross MacLeod <rmm+github@z.odi.ac>
Committer
Ross MacLeod <rmm+github@z.odi.ac>
Date

Message

check m_pLastMonitor->specialWorkspaceID before checking activeWorkspace

Diff

 1diff --git a/src/dispatchers.cpp b/src/dispatchers.cpp
 2index 667b1cf7a8e4599523ffd8192105aa3b599d8964..fd6c56d905f049db91c94792676a7d47df97c75f 100644
 3--- a/src/dispatchers.cpp
 4+++ b/src/dispatchers.cpp
 5@@ -9,7 +9,8 @@
 6 int workspace_for_action(bool allow_fullscreen = false) {
 7 	if (g_pLayoutManager->getCurrentLayout() != g_Hy3Layout.get()) return -1;
 8 
 9-	int workspace_id = g_pCompositor->m_pLastMonitor->activeWorkspace;
10+	int workspace_id = g_pCompositor->m_pLastMonitor->specialWorkspaceID;
11+	if (workspace_id == 0) workspace_id = g_pCompositor->m_pLastMonitor->activeWorkspace;
12 
13 	if (workspace_id == -1) return -1;
14 	auto* workspace = g_pCompositor->getWorkspaceByID(workspace_id);