From b9c439a55e5ecef563657da211bc10ddc3273a1c Mon Sep 17 00:00:00 2001 From: Vaxry Date: Sat, 9 Nov 2024 02:27:01 +0000 Subject: [PATCH] compositor: make sure we don't ret early on no surface if there is no implicit surface passed, make sure the current focus is not null, otherwise we nope early without focusing the window fixes #8293 --- src/Compositor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 495a2d85..da20c5cf 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -1062,7 +1062,7 @@ void CCompositor::focusWindow(PHLWINDOW pWindow, SP pSurface return; } - if (m_pLastWindow.lock() == pWindow && g_pSeatManager->state.keyboardFocus == pSurface) + if (m_pLastWindow.lock() == pWindow && g_pSeatManager->state.keyboardFocus == pSurface && g_pSeatManager->state.keyboardFocus) return; if (pWindow->m_bPinned)