From d81c216db18c5e9e50c30c4a3f6a3bfb1928868b Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Wed, 16 Nov 2011 13:47:34 +0200 Subject: [PATCH] shell: fix compositor wakeup while locked Compositor is locked, woken up, unlock dialog is shown; if the compositor does to sleep again, before being unlocked, it will never wake up again, because unlock() becomes a no-op, yet it should wake the compositor up. Fix this by letting unlock() to wake up the compositor, if lock surface is present. Signed-off-by: Pekka Paalanen --- compositor/shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compositor/shell.c b/compositor/shell.c index 822c8c915..3a7169741 100644 --- a/compositor/shell.c +++ b/compositor/shell.c @@ -1037,7 +1037,7 @@ unlock(struct wlsc_shell *base) { struct wl_shell *shell = container_of(base, struct wl_shell, shell); - if (!shell->locked) { + if (!shell->locked || shell->lock_surface) { wlsc_compositor_wake(shell->compositor); return; }