diff options
author | YeongJong Lee <yj34.lee@samsung.com> | 2018-04-06 09:38:10 -0500 |
---|---|---|
committer | Derek Foreman <derekf@osg.samsung.com> | 2018-04-06 09:38:23 -0500 |
commit | 67be5b427a13d88a679e265ba7f33fb2c0f64cdb (patch) | |
tree | 9decdd5a4c458a5c160e032278ac522196301a3f /src/lib/efl_wl/efl_wl.c | |
parent | b63d64bda2bc736245c90cd794f3d47ac858266d (diff) |
efl_wl: Add NULL check
Reviewers: zmike, ManMower, Jaehyun_Cho, woohyun
Reviewed By: ManMower
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D5862
Diffstat (limited to '')
-rw-r--r-- | src/lib/efl_wl/efl_wl.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c index 0682f0e489..a6c51b07b9 100644 --- a/src/lib/efl_wl/efl_wl.c +++ b/src/lib/efl_wl/efl_wl.c | |||
@@ -634,6 +634,7 @@ static void | |||
634 | comp_surface_proxy_win_del(Ecore_Evas *ee) | 634 | comp_surface_proxy_win_del(Ecore_Evas *ee) |
635 | { | 635 | { |
636 | Comp_Seat *s = ecore_evas_data_get(ee, "comp_seat"); | 636 | Comp_Seat *s = ecore_evas_data_get(ee, "comp_seat"); |
637 | if (!s) return; | ||
637 | 638 | ||
638 | s->drag.proxy_win = NULL; | 639 | s->drag.proxy_win = NULL; |
639 | //fprintf(stderr, "PROXY WIN DEL\n"); | 640 | //fprintf(stderr, "PROXY WIN DEL\n"); |
@@ -2314,7 +2315,12 @@ comp_surface_multi_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNU | |||
2314 | if ((!l) || (s->drag.tch && ((uint32_t)ev->device == s->drag.id))) | 2315 | if ((!l) || (s->drag.tch && ((uint32_t)ev->device == s->drag.id))) |
2315 | { | 2316 | { |
2316 | if (s->drag.tch) | 2317 | if (s->drag.tch) |
2317 | wl_data_device_send_drop(data_device_find(s, cs->res)); | 2318 | { |
2319 | res = data_device_find(s, cs->res); | ||
2320 | if (!res) return; | ||
2321 | |||
2322 | wl_data_device_send_drop(res); | ||
2323 | } | ||
2318 | comp_surface_input_event(&s->tch.events, ev->device, 0, ev->timestamp, 1); | 2324 | comp_surface_input_event(&s->tch.events, ev->device, 0, ev->timestamp, 1); |
2319 | s->event_propagate = 1; | 2325 | s->event_propagate = 1; |
2320 | ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; | 2326 | ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; |