From 875a7eb0dafbd325ddabc4c7bd6e889c8e8ea46c Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Thu, 15 Mar 2018 15:01:10 +0100 Subject: [PATCH] efl_ui_focus_manager_calc: do not set focus on a deletion manager otherwise objects might already be on the way out, without a elementary parent. --- src/lib/elementary/efl_ui_focus_manager_calc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c index 4b2bb25480..403f8cf265 100644 --- a/src/lib/elementary/efl_ui_focus_manager_calc.c +++ b/src/lib/elementary/efl_ui_focus_manager_calc.c @@ -1026,7 +1026,7 @@ _efl_ui_focus_manager_calc_unregister(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Manager_ eina_hash_del_by_key(pd->node_hash, &child); - if (refocus) + if (refocus && !efl_invalidated_get(pd->root->focusable)) { Node *n = eina_list_last_data_get(pd->focus_stack); if (!n)