From bc3f5b94eb55b5538540942dd1dc676a7d757d6d Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Mon, 26 Feb 2024 21:12:12 +0000
Subject: [PATCH] core: nullcheck for old monitor in moveWorkspaceToMonitor

fixes #4495
---
 src/Compositor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 5d76054b..da7cd878 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -2182,7 +2182,7 @@ void CCompositor::moveWorkspaceToMonitor(CWorkspace* pWorkspace, CMonitor* pMoni
 
     // fix old mon
     int nextWorkspaceOnMonitorID = -1;
-    if (!SWITCHINGISACTIVE)
+    if (!SWITCHINGISACTIVE || !POLDMON)
         nextWorkspaceOnMonitorID = pWorkspace->m_iID;
     else {
         for (auto& w : m_vWorkspaces) {