efl_ui_focus_layer: avoid a call to NULL
authorYeongJong Lee <yj34.lee@samsung.com>
Wed, 24 Jan 2018 09:49:04 +0000 (18:49 +0900)
committerWonki Kim <wonki_.kim@samsung.com>
Tue, 3 Apr 2018 09:50:05 +0000 (18:50 +0900)
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

index 363b174..9df3ed8 100644 (file)
@@ -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);