From deb18af955f5282c1c37a3cfcce85cfbd717d418 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Sat, 14 May 2022 20:56:21 +0200
Subject: Protect against crash in focusWindow

---
 src/Compositor.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index cd3fed1d..32a3ffde 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -402,13 +402,13 @@ void CCompositor::focusWindow(CWindow* pWindow, wlr_surface* pSurface) {
         return;
     }
 
-    if (pWindow->m_bNoFocus) {
-        Debug::log(LOG, "Ignoring focus to nofocus window!");
+    if (!pWindow || !windowValidMapped(pWindow)) {
+        wlr_seat_keyboard_notify_clear_focus(m_sSeat.seat);
         return;
     }
 
-    if (!pWindow || !windowValidMapped(pWindow)) {
-        wlr_seat_keyboard_notify_clear_focus(m_sSeat.seat);
+    if (pWindow->m_bNoFocus) {
+        Debug::log(LOG, "Ignoring focus to nofocus window!");
         return;
     }
 
-- 
cgit v1.2.3