summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-05-19 15:53:15 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-05-19 15:53:52 -0400
commitfb082484b0dd66568ffc522997371d4b7fa0431d (patch)
tree3f74abf4cc7974f41984832b9e747bebcb33b381
parent6d7a73c68f499e8d0ff33f1dfeec34764450fa2e (diff)
downloadefl-fb082484b0dd66568ffc522997371d4b7fa0431d.tar.gz
ecore-wl2: permit null drag icon window in ecore_wl2_dnd_drag_start()
this is explicitly allowed in the spec @fix
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_dnd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ecore_wl2/ecore_wl2_dnd.c b/src/lib/ecore_wl2/ecore_wl2_dnd.c
index 9196c10cf7..f0376cb0df 100644
--- a/src/lib/ecore_wl2/ecore_wl2_dnd.c
+++ b/src/lib/ecore_wl2/ecore_wl2_dnd.c
@@ -463,13 +463,13 @@ ecore_wl2_dnd_drag_types_set(Ecore_Wl2_Input *input, const char **types)
EAPI uint32_t
ecore_wl2_dnd_drag_start(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window, Ecore_Wl2_Window *drag_window)
{
- struct wl_surface *dsurface, *osurface;
+ struct wl_surface *dsurface = NULL, *osurface;
EINA_SAFETY_ON_NULL_RETURN_VAL(input, 0);
EINA_SAFETY_ON_NULL_RETURN_VAL(input->data.drag.source, 0);
- EINA_SAFETY_ON_NULL_RETURN_VAL(drag_window, 0);
- dsurface = ecore_wl2_window_surface_get(drag_window);
+ if (drag_window)
+ dsurface = ecore_wl2_window_surface_get(drag_window);
_ecore_wl2_input_ungrab(input);