From 60d97311be5492b02843c4e9d46f818d43499dae Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 15 Jul 2015 13:00:45 -0500 Subject: [PATCH] desktop-shell: Don't call wl_list_init() in the middle of a list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit seat->keyboard_focus_listener.link isn't a head, it's just sometimes a member of the focus signal list. Calling wl_list_init() on it puts a loop in the list. Instead, we remove the item then init it. That way we can call remove on it again later even if it hasn't been re-added to a list. Signed-off-by: Derek Foreman Reviewed-by: Jonas Ådahl --- desktop-shell/shell.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index dec9169b..d08b0d81 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -3110,6 +3110,7 @@ shell_seat_caps_changed(struct wl_listener *listener, void *data) wl_signal_add(&seat->seat->keyboard->focus_signal, &seat->keyboard_focus_listener); } else if (!seat->seat->keyboard) { + wl_list_remove(&seat->keyboard_focus_listener.link); wl_list_init(&seat->keyboard_focus_listener.link); } @@ -3118,6 +3119,7 @@ shell_seat_caps_changed(struct wl_listener *listener, void *data) wl_signal_add(&seat->seat->pointer->focus_signal, &seat->pointer_focus_listener); } else if (!seat->seat->pointer) { + wl_list_remove(&seat->pointer_focus_listener.link); wl_list_init(&seat->pointer_focus_listener.link); } }