blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1527 from johnchen902/fix-sway-3545-2 

Fix another instance of swaywm/sway#3545.
This commit is contained in:
Drew DeVault 2019-02-03 09:56:59 +01:00 committed by GitHub
parent f24e17259e 819bd3e344
commit 04c9ca4198
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xwayland/selection/dnd.c
View File

@ -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_container_of(listener, xwm, seat_drag_source_destroy);
wl_list_remove(&xwm->seat_drag_source_destroy.link); 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; 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); wl_signal_add(&drag->events.destroy, &xwm->seat_drag_destroy);
xwm->seat_drag_destroy.notify = seat_handle_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, wl_signal_add(&drag->source->events.destroy,
&xwm->seat_drag_source_destroy); &xwm->seat_drag_source_destroy);
xwm->seat_drag_source_destroy.notify = seat_handle_drag_source_destroy; xwm->seat_drag_source_destroy.notify = seat_handle_drag_source_destroy;