From 8c77491150244eee2e955c4ccc41e6f498f65645 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 4 Jan 2020 09:16:26 -0500 Subject: [PATCH] wayland: Fix action handling more When updating GdkDrop::actions from changes sent by the compositor, we were inadvertently setting them to 0, causing drops to appear impossible. --- gdk/wayland/gdkdrop-wayland.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gdk/wayland/gdkdrop-wayland.c b/gdk/wayland/gdkdrop-wayland.c index 3e0a25deaa..686157fd81 100644 --- a/gdk/wayland/gdkdrop-wayland.c +++ b/gdk/wayland/gdkdrop-wayland.c @@ -288,7 +288,8 @@ gdk_wayland_drop_update_actions (GdkWaylandDrop *drop) GdkDragAction gdk_actions = 0; uint32_t wl_actions; - if (drop->action & WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK) + if (drop->action == 0 || + drop->action & WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK) wl_actions = drop->source_actions; else wl_actions = drop->action;