summaryrefslogtreecommitdiff
path: root/src/Compositor.cpp
diff options
context:
space:
mode:
authorvaxerski <43317083+vaxerski@users.noreply.github.com>2022-05-31 17:17:44 +0200
committervaxerski <43317083+vaxerski@users.noreply.github.com>2022-05-31 17:17:44 +0200
commite73df80782593f0cab39a5f3e7a5a005203c9b0c (patch)
treef8a820c102590b2fcda837089655cae26b191e0b /src/Compositor.cpp
parent0d7131d30efba3b8d279ddaada6651b11751226b (diff)
Add mon in mon out events and fix crash
Diffstat (limited to 'src/Compositor.cpp')
-rw-r--r--src/Compositor.cpp5
1 files changed, 3 insertions, 2 deletions
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);