From e73df80782593f0cab39a5f3e7a5a005203c9b0c Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Tue, 31 May 2022 17:17:44 +0200
Subject: Add mon in mon out events and fix crash

---
 src/Compositor.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/Compositor.cpp')

diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 4dfb5297..f7f1d68f 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -1053,8 +1053,9 @@ void CCompositor::moveWorkspaceToMonitor(CWorkspace* pWorkspace, SMonitor* pMoni
 
     if (SWITCHINGISACTIVE) { // if it was active, preserve its' status. If it wasn't, don't.
         Debug::log(LOG, "moveWorkspaceToMonitor: SWITCHINGISACTIVE, active %d -> %d", pMonitor->activeWorkspace, pWorkspace->m_iID);
-        
-        getWorkspaceByID(pMonitor->activeWorkspace)->startAnim(false, false);
+
+        if (const auto PWORKSPACE = getWorkspaceByID(pMonitor->activeWorkspace); PWORKSPACE)
+            getWorkspaceByID(pMonitor->activeWorkspace)->startAnim(false, false);
 
         pMonitor->activeWorkspace = pWorkspace->m_iID;
         g_pLayoutManager->getCurrentLayout()->recalculateMonitor(pMonitor->ID);
-- 
cgit v1.2.3