From ce6703e97985f31ef39d5e97f34b95e5520ff741 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Wed, 12 Aug 2015 17:45:01 -0400
Subject: [PATCH] only delete current drag on x11 xdnd selection loss if x11
 owned selection

---
 src/modules/xwayland/dnd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/xwayland/dnd.c b/src/modules/xwayland/dnd.c
index ddc3bfd28..59f9c81d7 100644
--- a/src/modules/xwayland/dnd.c
+++ b/src/modules/xwayland/dnd.c
@@ -223,7 +223,9 @@ _xwl_fixes_selection_notify(void *d EINA_UNUSED, int t EINA_UNUSED, Ecore_X_Even
           }
         else
           {
-             if (e_comp->wl_comp_data->drag)
+             if (e_comp->wl_comp_data->drag &&
+                 e_comp->wl_comp_data->drag_client &&
+                 e_client_has_xwindow(e_comp->wl_comp_data->drag_client))
                e_object_del(E_OBJECT(e_comp->wl_comp_data->drag));
           }
         e_screensaver_inhibit_toggle(!!ev->owner);