aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-04-17 18:52:31 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-04-21 10:51:44 +0200
commit6c9b020a0f8f40213040024e8b8af1a14c2faeb8 (patch)
treec4478c7e9b9571a3ff3eb3b4248b826cccb4888c /src/lib/elementary/efl_ui_win.c
parentefl_ui_layout: only delete and unparent objects here when alive (diff)
downloadefl-6c9b020a0f8f40213040024e8b8af1a14c2faeb8.tar.gz
efl_ui_win: do not error when NULL is setted as content
NULL is valid, and the sub_object code does refuse to allow NULL, hence we need this check here. Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8638
Diffstat (limited to 'src/lib/elementary/efl_ui_win.c')
-rw-r--r--src/lib/elementary/efl_ui_win.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index b37c1de997..d69e734083 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -7547,7 +7547,7 @@ _efl_ui_win_content_set(Eo *obj, Efl_Ui_Win_Data *sd, const char *part, Eo *cont
if (eina_streq(part, "content"))
{
if (sd->content == content) return EINA_TRUE;
- if (!elm_widget_sub_object_add(obj, content))
+ if (content && !elm_widget_sub_object_add(obj, content))
goto err;
/* FIXME: Switch to swallow inside the frame
if (!edje_object_part_swallow(sd->frame_obj, "elm.swallow.client", content))