From 70cfc7cc9c4ecadbb9dd9a75f096fc70177a8ca5 Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Mon, 3 Feb 2025 19:53:14 +0000
Subject: [PATCH] cmonitor: guard old workspace

---
 src/helpers/Monitor.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/helpers/Monitor.cpp b/src/helpers/Monitor.cpp
index 3ea6d49ba..e48432110 100644
--- a/src/helpers/Monitor.cpp
+++ b/src/helpers/Monitor.cpp
@@ -1019,15 +1019,17 @@ void CMonitor::changeWorkspace(const PHLWORKSPACE& pWorkspace, bool internal, bo
     if (pWorkspace == activeWorkspace)
         return;
 
-    const auto POLDWORKSPACE  = activeWorkspace;
-    POLDWORKSPACE->m_bVisible = false;
-    pWorkspace->m_bVisible    = true;
+    const auto POLDWORKSPACE = activeWorkspace;
+    if (POLDWORKSPACE)
+        POLDWORKSPACE->m_bVisible = false;
+    pWorkspace->m_bVisible = true;
 
     activeWorkspace = pWorkspace;
 
     if (!internal) {
-        const auto ANIMTOLEFT = pWorkspace->m_iID > POLDWORKSPACE->m_iID;
-        POLDWORKSPACE->startAnim(false, ANIMTOLEFT);
+        const auto ANIMTOLEFT = POLDWORKSPACE && pWorkspace->m_iID > POLDWORKSPACE->m_iID;
+        if (POLDWORKSPACE)
+            POLDWORKSPACE->startAnim(false, ANIMTOLEFT);
         pWorkspace->startAnim(true, ANIMTOLEFT);
 
         // move pinned windows