diff options
-rw-r--r-- | src/wayland/meta-wayland-data-device.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/wayland/meta-wayland-data-device.c b/src/wayland/meta-wayland-data-device.c index db77f11ca..854bdfc80 100644 --- a/src/wayland/meta-wayland-data-device.c +++ b/src/wayland/meta-wayland-data-device.c @@ -352,6 +352,7 @@ drag_grab_motion (MetaWaylandPointerGrab *grab, static void data_device_end_drag_grab (MetaWaylandDragGrab *drag_grab) { + meta_wayland_drag_grab_set_source (drag_grab, NULL); meta_wayland_drag_grab_set_focus (drag_grab, NULL); if (drag_grab->drag_origin) @@ -366,8 +367,6 @@ data_device_end_drag_grab (MetaWaylandDragGrab *drag_grab) wl_list_remove (&drag_grab->drag_icon_listener.link); } - meta_wayland_drag_grab_set_source (drag_grab, NULL); - if (drag_grab->feedback_actor) { clutter_actor_remove_all_children (drag_grab->feedback_actor); @@ -448,9 +447,6 @@ drag_grab_button (MetaWaylandPointerGrab *grab, meta_wayland_data_source_has_target (source) && meta_wayland_data_source_get_current_action (source)) { - /* Detach the data source from the grab, it's meant to live longer */ - meta_wayland_drag_grab_set_source (drag_grab, NULL); - meta_wayland_surface_drag_dest_drop (drag_grab->drag_focus); meta_wayland_data_source_notify_drop_performed (source); |