From 0e5d03a5574efb78f06f2723b345bac867d98696 Mon Sep 17 00:00:00 2001
From: Maximilian Seidler <78690852+PaideiaDilemma@users.noreply.github.com>
Date: Fri, 24 Jan 2025 15:50:15 +0000
Subject: [PATCH] datadevice: do the unfocus surface stuff before dndActive is
 true (#9157)

---
 src/managers/SeatManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/managers/SeatManager.cpp b/src/managers/SeatManager.cpp
index 8fee6b16..6d2b906f 100644
--- a/src/managers/SeatManager.cpp
+++ b/src/managers/SeatManager.cpp
@@ -194,7 +194,7 @@ void CSeatManager::setPointerFocus(SP<CWLSurfaceResource> surf, const Vector2D&
     if (state.pointerFocus == surf)
         return;
 
-    if (PROTO::data->dndActive()) {
+    if (PROTO::data->dndActive() && surf) {
         if (state.dndPointerFocus == surf)
             return;
         Debug::log(LOG, "[seatmgr] Refusing pointer focus during an active dnd, but setting dndPointerFocus");