From e98740d5d0f8eb23e4afebb8661643a70946b5a7 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Wed, 17 Apr 2019 18:51:32 +0200 Subject: [PATCH] efl_ui_layout: only delete and unparent objects here when alive something else might cause the object to get magically revived. Once the object is invalidated, some things are able to set a parent again, which causes the widget to continue with refcount 1 and a parent. Reviewed-by: Cedric BAIL Differential Revision: https://phab.enlightenment.org/D8637 --- src/lib/elementary/efl_ui_layout.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 7c5f03a..61bb413 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -1185,8 +1185,11 @@ _efl_ui_layout_content_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Ev if (!strcmp(part, sub_d->part)) { if (content == sub_d->obj) goto end; - _eo_unparent_helper(sub_d->obj, obj); - evas_object_del(sub_d->obj); + if (efl_alive_get(sub_d->obj)) + { + _eo_unparent_helper(sub_d->obj, obj); + evas_object_del(sub_d->obj); + } break; } /* was previously swallowed at another part -- mimic -- 2.7.4