From 819bd3e344d66a4616ae91eeaf6267bae23fca18 Mon Sep 17 00:00:00 2001 From: John Chen Date: Sun, 3 Feb 2019 15:09:52 +0800 Subject: [PATCH] Fix another instance of swaywm/sway#3545. --- xwayland/selection/dnd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xwayland/selection/dnd.c b/xwayland/selection/dnd.c index ec5f16c7..fc090936 100644 --- a/xwayland/selection/dnd.c +++ b/xwayland/selection/dnd.c @@ -315,6 +315,8 @@ static void seat_handle_drag_source_destroy(struct wl_listener *listener, wl_container_of(listener, xwm, seat_drag_source_destroy); wl_list_remove(&xwm->seat_drag_source_destroy.link); + xwm->seat_drag_source_destroy.link.prev = NULL; + xwm->seat_drag_source_destroy.link.next = NULL; xwm->drag_focus = NULL; } @@ -332,6 +334,9 @@ void xwm_seat_handle_start_drag(struct wlr_xwm *xwm, struct wlr_drag *drag) { wl_signal_add(&drag->events.destroy, &xwm->seat_drag_destroy); xwm->seat_drag_destroy.notify = seat_handle_drag_destroy; + if (xwm->seat_drag_source_destroy.link.prev != NULL) { + wl_list_remove(&xwm->seat_drag_source_destroy.link); + } wl_signal_add(&drag->source->events.destroy, &xwm->seat_drag_source_destroy); xwm->seat_drag_source_destroy.notify = seat_handle_drag_source_destroy;