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

elementary: avoid segfault when getting focus due to an infinite recursion. 

This was two line switched and setting the callbacks on the wrong object.
This commit is contained in:
Cedric BAIL 2017-09-26 15:21:12 -07:00
parent 37d6bc03fd
commit 1ac4a03d4f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/elementary/efl_ui_win.c
View File

@ -2829,9 +2829,9 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd)
_elm_win_on_resize_obj_changed_size_hints,
obj);
efl_event_callback_array_del(obj, _elm_evas_tracking(), sd);
efl_event_callback_array_del(sd->evas, _elm_evas_tracking(), sd);
efl_event_callback_array_del(obj, _elm_win_evas_feed_fake_callbacks(), sd->evas);
efl_event_callback_array_del(sd->evas, _elm_win_tracking(), sd);
efl_event_callback_array_del(obj, _elm_win_tracking(), sd);
evas_object_del(sd->legacy.box);
evas_object_del(sd->legacy.edje);
@ -5347,10 +5347,9 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
// attach config API
efl_composite_attach(obj, efl_provider_find(ecore_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS));
efl_event_callback_array_add(sd->evas, _elm_evas_tracking(), sd);
efl_event_callback_array_add(obj, _elm_win_evas_feed_fake_callbacks(), sd->evas);
efl_event_callback_array_add(obj, _elm_evas_tracking(), sd);
efl_event_callback_array_add(sd->evas, _elm_win_tracking(), sd);
efl_event_callback_array_add(obj, _elm_win_tracking(), sd);
evas_object_show(sd->legacy.edje);
if (type == ELM_WIN_FAKE)