diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 5946cc2bc2..837eed1d93 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -818,3 +818,7 @@ 2012-12-17 Chueon Park (Hermet) * Fix the popup that returned invalid action buttons. + +2012-12-17 Chueon Park (Hermet) + + * Makes naviframe safety even if someone deletes the naviframe in transition finished cb. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index 93e900f6bf..ce0e66d2d5 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -94,6 +94,7 @@ Fixes: * Now, dummy object is always smart member of naviframe. * Fix naviframe's resize object problem when item was deleted. * Fix the popup that returned invalid action buttons. + * Fix the naviframe to not have crash even if user deletes the naviframe in the transition finished cb. Removals: diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index 1fb2e3210a..cf3e873359 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -1059,10 +1059,10 @@ _on_item_show_finished(void *data, elm_widget_tree_unfocusable_set(it->content, it->content_unfocusable); - evas_object_smart_callback_call(WIDGET(it), SIG_TRANSITION_FINISHED, data); - if (sd->freeze_events) evas_object_freeze_events_set(VIEW(it), EINA_FALSE); + + evas_object_smart_callback_call(WIDGET(it), SIG_TRANSITION_FINISHED, data); } static void