From 8ba20fcae124591718bddadd94c5e8c381d02097 Mon Sep 17 00:00:00 2001 From: Vaxry Date: Sat, 5 Apr 2025 00:30:27 +0100 Subject: [PATCH] compositor: avoid crash on null window monitor move ref #9809 --- src/Compositor.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 90e03bcd5..058eeaa76 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -2733,8 +2733,7 @@ void CCompositor::moveWindowToWorkspaceSafe(PHLWINDOW pWindow, PHLWORKSPACE pWor const PHLWINDOW pFirstWindowOnWorkspace = pWorkspace->getFirstWindow(); const int visibleWindowsOnWorkspace = pWorkspace->getWindows(std::nullopt, true); - const auto PWINDOWMONITOR = pWindow->m_pMonitor.lock(); - const auto POSTOMON = pWindow->m_vRealPosition->goal() - PWINDOWMONITOR->vecPosition; + const auto POSTOMON = pWindow->m_vRealPosition->goal() - (pWindow->m_pMonitor ? pWindow->m_pMonitor->vecPosition : Vector2D{}); const auto PWORKSPACEMONITOR = pWorkspace->m_pMonitor.lock(); if (!pWindow->m_bIsFloating)