diff options
| author | Pekka Paalanen <ppaalanen@gmail.com> | 2011-11-16 13:47:35 +0200 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-11-16 08:52:26 -0500 |
| commit | 2ca8630aab29b1c4c61cd6a6e5c295ef8f2f7138 (patch) | |
| tree | ee2461d6e6abd117c128c6b4078008600063c16d | |
| parent | d81c216db18c5e9e50c30c4a3f6a3bfb1928868b (diff) | |
shell: fix handle_lock_surface_destroy()
A copy & paste bug, that resulted setting to NULL something else than
shell->lock_surface when that surface was destroyed.
The symptom: let compositor lock down, unlock it, let it lock down
again, and the unlock dialog is never requested again. This bug was
triggered by the previous fix "shell: fix compositor wakeup while
locked".
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
| -rw-r--r-- | compositor/shell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compositor/shell.c b/compositor/shell.c index 3a71697..7bae944 100644 --- a/compositor/shell.c +++ b/compositor/shell.c @@ -834,7 +834,7 @@ handle_lock_surface_destroy(struct wl_listener *listener, struct wl_resource *resource, uint32_t time) { struct wl_shell *shell = - container_of(listener, struct wl_shell, panel_listener); + container_of(listener, struct wl_shell, lock_surface_listener); fprintf(stderr, "lock surface gone\n"); shell->lock_surface = NULL; |