From 03385fc07f82bb891ded33db464397d867eb503d Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Tue, 18 Mar 2025 19:43:05 +0000
Subject: [PATCH] seatmgr: avoid crash on null surfs

---
 src/managers/SeatManager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/managers/SeatManager.cpp b/src/managers/SeatManager.cpp
index 6d2b906fb..23db671af 100644
--- a/src/managers/SeatManager.cpp
+++ b/src/managers/SeatManager.cpp
@@ -606,11 +606,11 @@ void CSeatManager::setGrab(SP<CSeatGrab> grab) {
 
         if (!refocus) {
             surf  = CWLSurface::fromResource(currentFocus);
-            layer = surf->getLayer();
+            layer = surf ? surf->getLayer() : nullptr;
         }
 
         if (!refocus && !layer) {
-            auto popup = surf->getPopup();
+            auto popup = surf ? surf->getPopup() : nullptr;
             if (popup) {
                 auto parent = popup->getT1Owner();
                 layer       = parent->getLayer();