From f0a136f9991c164998b9b26c6849585ea7647aa0 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 29 May 2019 09:18:26 -0400 Subject: [PATCH] elm/map: ignore zoom events during construction which cannot be handled Summary: sd->obj is null until after the object is finalized, so this codepath cannot be processed until then @fix Depends on D8966 Reviewers: devilhorns Reviewed By: devilhorns Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8967 --- src/lib/elementary/elm_map.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index c026afa1b8..7c0229b0df 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -1159,14 +1159,16 @@ _zoom_do(Elm_Map_Data *sd, ecore_timer_del(sd->zoom_timer); sd->zoom_timer = NULL; } - else + else if (sd->obj) efl_event_callback_legacy_call (sd->obj, EFL_UI_EVENT_ZOOM_START, NULL); if (sd->obj) - sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj); - efl_event_callback_legacy_call - (sd->obj, EFL_UI_EVENT_ZOOM_CHANGE, NULL); + { + sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj); + efl_event_callback_legacy_call + (sd->obj, EFL_UI_EVENT_ZOOM_CHANGE, NULL); + } efl_event_callback_legacy_call (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);