From 942efbcd77169381b8132893445394f8d412be07 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Sun, 20 Mar 2022 19:28:57 +0100
Subject: [PATCH] fix it again

---
 src/managers/KeybindManager.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index 20fa46d8..806808e5 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -130,9 +130,7 @@ void CKeybindManager::changeworkspace(std::string args) {
     // Workspace doesn't exist, create and switch
     const auto PMONITOR = g_pCompositor->getMonitorFromCursor();
 
-    // we need to move XWayland windows to narnia or otherwise they will still process our cursor and shit
-    // and that'd be annoying as hell
-    g_pCompositor->fixXWaylandWindowsOnWorkspace(PMONITOR->activeWorkspace);
+    const auto OLDWORKSPACE = PMONITOR->activeWorkspace;
 
     g_pCompositor->m_lWorkspaces.push_back(SWorkspace());
     const auto PWORKSPACE = &g_pCompositor->m_lWorkspaces.back();
@@ -141,4 +139,8 @@ void CKeybindManager::changeworkspace(std::string args) {
     PWORKSPACE->monitorID = PMONITOR->ID;
     
     PMONITOR->activeWorkspace = workspaceToChangeTo;
+
+    // we need to move XWayland windows to narnia or otherwise they will still process our cursor and shit
+    // and that'd be annoying as hell
+    g_pCompositor->fixXWaylandWindowsOnWorkspace(workspaceToChangeTo);
 }
\ No newline at end of file