From ed58cc4c31c21e09ee780d0df818afe935181cd9 Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Wed, 1 May 2024 02:33:36 +0100
Subject: [PATCH] sessionLock: remove m_pLastFocus on destroy of surface

fixes #5822
---
 src/protocols/SessionLock.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/protocols/SessionLock.cpp b/src/protocols/SessionLock.cpp
index ee7e201d..a33af3c5 100644
--- a/src/protocols/SessionLock.cpp
+++ b/src/protocols/SessionLock.cpp
@@ -51,6 +51,10 @@ CSessionLockSurface::CSessionLockSurface(SP<CExtSessionLockSurfaceV1> resource_,
             wlr_surface_unmap(pSurface);
             hyprListener_surfaceCommit.removeCallback();
             hyprListener_surfaceDestroy.removeCallback();
+
+            if (g_pCompositor->m_pLastFocus == pSurface)
+                g_pCompositor->m_pLastFocus = nullptr;
+
             pSurface = nullptr;
         },
         this, "SessionLockSurface");