zmike pushed a commit to branch efl-1.22. http://git.enlightenment.org/core/efl.git/commit/?id=d588ad12d88320629277dbbcdcbf05b6bc308dc4
commit d588ad12d88320629277dbbcdcbf05b6bc308dc4 Author: Marcel Hollerbach <[email protected]> Date: Wed Apr 17 18:52:31 2019 +0200 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 <[email protected]> Differential Revision: https://phab.enlightenment.org/D8638 --- src/lib/elementary/efl_ui_win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) --
