From 8eda161f67f112d37c5f2627f333e3c73a9618e7 Mon Sep 17 00:00:00 2001 From: YeongJong Lee Date: Wed, 24 Jan 2018 18:49:04 +0900 Subject: [PATCH] efl_ui_focus_layer: avoid a call to NULL Summary: efl_ui_focus_layer_enable_set(obj, EINA_FALSE) can be called before registered_manager assigned Test Plan: 1. EINA_LOG_LEVELS=eo:2 elementary_test -to menu 2. terminate the elemetary_test 3. check that there is no focus_manager warning about a call to NULL Reviewers: bu5hm4n Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5759 --- src/lib/elementary/efl_ui_focus_layer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/elementary/efl_ui_focus_layer.c b/src/lib/elementary/efl_ui_focus_layer.c index 363b1742f5..9df3ed89b9 100644 --- a/src/lib/elementary/efl_ui_focus_layer.c +++ b/src/lib/elementary/efl_ui_focus_layer.c @@ -93,6 +93,8 @@ _efl_ui_focus_layer_enable_set(Eo *obj, Efl_Ui_Focus_Layer_Data *pd, Eina_Bool v } else { + if (!pd->registered_manager) return; + if (efl_ui_focus_manager_redirect_get(pd->registered_manager) == obj) efl_ui_focus_manager_redirect_set(pd->registered_manager, NULL);