From: Marcel Hollerbach <mail@marcel-hollerbach.de>
Date: Wed, 17 Apr 2019 16:51:32 +0000 (+0200)
Subject: efl_ui_layout: only delete and unparent objects here when alive
X-Git-Tag: submit/tizen/20190424.060632~35
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e98740d5d0f8eb23e4afebb8661643a70946b5a7;p=platform%2Fupstream%2Fefl.git

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 <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D8637
---

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