From 345b9c75423315e66c87b7e3d0f6a3932c7d2a0d Mon Sep 17 00:00:00 2001 From: Xavi Artigas Date: Tue, 19 Mar 2019 16:50:13 +0100 Subject: [PATCH] Revert "efl_ui_widget: resolve warning about multiple defines" This reverts commit 9012742f9a6e0ac09f34b7df23b1ac8d166239e1. I landed this too hastily. --- src/lib/elementary/efl_ui_widget.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index cbac01c..a510018 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -565,6 +565,11 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool s if (efl_isa(pd->logical.parent, EFL_UI_WIDGET_CLASS)) { ELM_WIDGET_DATA_GET(pd->logical.parent, logical_wd); + if (!logical_wd) + { + ERR("Widget parent has the wrong type!"); + return NULL; + } logical_wd->logical.child_count --; } old = pd->logical.parent; @@ -576,6 +581,11 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool s if (efl_isa(parent, EFL_UI_WIDGET_CLASS)) { ELM_WIDGET_DATA_GET(parent, parent_wd); + if (!parent_wd) + { + ERR("Widget parent has the wrong type!"); + return NULL; + } parent_wd->logical.child_count ++; } pd->logical.parent = parent; -- 2.7.4