aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksa Sarai <cyphar@cyphar.com>2016-12-26 19:23:07 +1100
committerAleksa Sarai <cyphar@cyphar.com>2016-12-26 19:23:07 +1100
commit29a535aae4ff631aced5753b45ef32a5f1b342dc (patch)
treef54a9f9a6b34a474b2a87136b8ec45090f7151c6
parent36e48fcf8db273a7d16356248f67aadb27d58ee1 (diff)
sway: extensions: only unlock if lock_surfaces.length == 0
When destroying lock surfaces, we really should only unlock a desktop_shell if the set of lock surfaces has dropped to zero (since callers need to do a set_lock_surface for every output). Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
-rw-r--r--sway/extensions.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/extensions.c b/sway/extensions.c
index 40702e28..547aa931 100644
--- a/sway/extensions.c
+++ b/sway/extensions.c
@@ -65,10 +65,12 @@ void lock_surface_destructor(struct wl_resource *resource) {
if (surface == resource) {
list_del(desktop_shell.lock_surfaces, i);
arrange_windows(&root_container, -1, -1);
- desktop_shell.is_locked = false;
break;
}
}
+ if (desktop_shell.lock_surfaces->length == 0) {
+ desktop_shell.is_locked = false;
+ }
}
static void set_background(struct wl_client *client, struct wl_resource *resource,