From: tokyo4j <hrak1529@gmail.com>
Date: Tue, 2 Jul 2024 13:04:02 +0000 (+0900)
Subject: session-lock: never allow multiple session-locks
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=880522d142a24e05927d00c7a75e50f61d66f7dc;p=proto%2Flabwc.git

session-lock: never allow multiple session-locks

I forgot to set session_lock_manager->lock, so it was always NULL.
This barely worked, but allowed multiple session-locks and conflicted
with comments in session-lock.h.
---

diff --git a/src/session-lock.c b/src/session-lock.c
index 30b4fcac..09b62784 100644
--- a/src/session-lock.c
+++ b/src/session-lock.c
@@ -287,6 +287,7 @@ handle_lock_destroy(struct wl_listener *listener, void *data)
 	wl_list_remove(&manager->lock_destroy.link);
 	wl_list_remove(&manager->lock_unlock.link);
 	wl_list_remove(&manager->lock_new_surface.link);
+	manager->lock = NULL;
 }
 
 static void
@@ -323,6 +324,7 @@ handle_new_session_lock(struct wl_listener *listener, void *data)
 	wl_signal_add(&lock->events.destroy, &manager->lock_destroy);
 
 	manager->locked = true;
+	manager->lock = lock;
 	wlr_session_lock_v1_send_locked(lock);
 }