From f90ffedf14dff85c55030c2c465d166c30c7be14 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Thu, 14 Nov 2024 16:23:35 +0000 Subject: [PATCH] Ensure active window isn't focused when screen is locked If the screen is locked, but the lockscreen isn't ready for painting, pickFocus() returns the active window. This somehow leads to the meta key getting "stuck" if you lock the screen with Meta+L. BUG: 495325 (cherry picked from commit c1e3dc0e083dee84aa24f8fb0a42dc112270645d) Co-authored-by: Adam Nydahl --- src/keyboard_input.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/keyboard_input.cpp b/src/keyboard_input.cpp index 715d2dc5cc..65145a8a00 100644 --- a/src/keyboard_input.cpp +++ b/src/keyboard_input.cpp @@ -209,6 +209,7 @@ Window *KeyboardInputRedirection::pickFocus() const return t; } while (it != stacking.begin()); } + return nullptr; } if (input()->isSelectingWindow()) {