From 6644808159e5b450ccdda78ff6272e1fad102bda Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 11 Aug 2017 18:43:15 -0400 Subject: [PATCH] elm_widget: do not reparent subobjs to top widget for non-elm objects this breaks handling of non-elm objects and makes it impossible to safely manage object lifetimes ref D3957 ref 62cf70034de38b17f2025e08f81b5758b3d6d6e3 @fix --- src/lib/elementary/elm_widget.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h index 86d5b6f..9fc2cbe 100644 --- a/src/lib/elementary/elm_widget.h +++ b/src/lib/elementary/elm_widget.h @@ -846,7 +846,8 @@ static inline Eina_Bool _elm_widget_sub_object_redirect_to_top(Evas_Object *obj, Evas_Object *sobj) { Eina_Bool ret = elm_widget_sub_object_del(obj, sobj); - if (ret) + if (!ret) return ret; + if (elm_widget_is(sobj)) ret = elm_widget_sub_object_add(elm_widget_top_get(obj), sobj); return ret; -- 2.7.4