enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

efl_ui_scroll_manager: avoid some safety check errors on deletion 

only remove callbacks if pan_obj is still alive

Differential Revision: https://phab.enlightenment.org/D7822
This commit is contained in:
Mike Blumenkrantz 2019-01-29 12:46:17 -05:00 committed by Marcel Hollerbach
parent dc8e46a926
commit b8617843f7
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/elementary/efl_ui_scroll_manager.c
View File

@ -2433,6 +2433,8 @@ _efl_ui_scroll_manager_efl_object_destructor(Eo *obj, Efl_Ui_Scroll_Manager_Data
ELM_ANIMATOR_DISCONNECT(sd->event_rect, sd->scrollto.x.animator, _efl_ui_scroll_manager_scroll_to_x_animator, sd);
ELM_ANIMATOR_DISCONNECT(sd->event_rect, sd->scrollto.y.animator, _efl_ui_scroll_manager_scroll_to_y_animator, sd);
if (!efl_invalidating_get(sd->pan_obj))
{
evas_object_event_callback_del_full(sd->pan_obj, EVAS_CALLBACK_RESIZE,
_efl_ui_scroll_manager_pan_resized_cb, obj);
evas_object_event_callback_del_full(sd->pan_obj, EVAS_CALLBACK_MOVE,
@ -2443,7 +2445,7 @@ _efl_ui_scroll_manager_efl_object_destructor(Eo *obj, Efl_Ui_Scroll_Manager_Data
(sd->pan_obj, EFL_UI_PAN_EVENT_VIEWPORT_CHANGED, _efl_ui_scroll_manager_pan_viewport_changed_cb, sd);
efl_event_callback_del
(sd->pan_obj, EFL_UI_PAN_EVENT_POSITION_CHANGED, _efl_ui_scroll_manager_pan_position_changed_cb, sd);
}
efl_destructor(efl_super(obj, MY_CLASS));
}