kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore wl2 - dnd - handle NULL drags... shouldnt happen but does 

this should fix T5770

@fix
This commit is contained in:
Carsten Haitzler 2017-07-24 18:53:33 +09:00
parent fd9e6b305d
commit 85e5858466
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/ecore_wl2/ecore_wl2_dnd.c
View File

@ -316,14 +316,16 @@ _ecore_wl2_dnd_leave(Ecore_Wl2_Input *input)
if (input->focus.keyboard)
ev->source = input->focus.keyboard->id;
ev->win = input->drag->window_id;
if (input->drag)
ev->win = input->drag->window_id;
ev->offer = input->drag;
ev->offer->ref++;
ev->seat = input->id;
ev->display = input->display;
ev->display->refs++;
input->drag->window_id = 0;
if (input->drag)
input->drag->window_id = 0;
ecore_event_add(ECORE_WL2_EVENT_DND_LEAVE, ev, _delay_offer_destroy, ev->offer);
input->drag = NULL;
}
@ -339,12 +341,14 @@ _ecore_wl2_dnd_motion(Ecore_Wl2_Input *input, int x, int y, uint32_t serial)
ev = calloc(1, sizeof(Ecore_Wl2_Event_Dnd_Motion));
if (!ev) return;
input->drag->serial = serial;
if (input->drag)
input->drag->serial = serial;
if (input->focus.keyboard)
ev->source = input->focus.keyboard->id;
ev->win = input->drag->window_id;
if (input->drag)
ev->win = input->drag->window_id;
ev->x = x;
ev->y = y;
ev->offer = input->drag;
@ -366,7 +370,8 @@ _ecore_wl2_dnd_drop(Ecore_Wl2_Input *input)
if (input->focus.keyboard)
ev->source = input->focus.keyboard->id;
ev->win = input->drag->window_id;
if (input->drag)
ev->win = input->drag->window_id;
ev->x = input->pointer.sx;
ev->y = input->pointer.sy;
ev->offer = input->drag;