cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=734637c42c51e12d0284d22fbe6f2458c213fbab
commit 734637c42c51e12d0284d22fbe6f2458c213fbab Author: Mike Blumenkrantz <[email protected]> Date: Fri Jul 19 15:43:21 2019 -0400 edje: add some null checks for nonexistent objects minor cleanup to fix EVAS_DEBUG_ABORT usage Reviewed-by: Cedric BAIL <[email protected]> Differential Revision: https://phab.enlightenment.org/D9361 --- src/lib/edje/edje_entry.c | 6 +++--- src/lib/edje/edje_load.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c index b5397b2c91..2363c4b2d3 100644 --- a/src/lib/edje/edje_entry.c +++ b/src/lib/edje/edje_entry.c @@ -3014,9 +3014,9 @@ _edje_entry_real_part_init(Edje *ed, Edje_Real_Part *rp) if (rp->part->entry_mode >= EDJE_ENTRY_EDIT_MODE_EDITABLE) { - evas_object_show(en->cursor_bg); - evas_object_show(en->cursor_fg); - evas_object_show(en->cursor_fg2); + if (en->cursor_bg) evas_object_show(en->cursor_bg); + if (en->cursor_fg) evas_object_show(en->cursor_fg); + if (en->cursor_fg2) evas_object_show(en->cursor_fg2); en->input_panel_enable = EINA_TRUE; #ifdef HAVE_ECORE_IMF diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c index 40109c0c1b..c28bfc572c 100644 --- a/src/lib/edje/edje_load.c +++ b/src/lib/edje/edje_load.c @@ -1356,7 +1356,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch for (i = 0; i < ed->table_parts_size; i++) { rp = ed->table_parts[i]; - evas_object_show(rp->object); + /* SPACER parts do not have objects */ + if (rp->object) evas_object_show(rp->object); if (_edje_block_break(ed)) break; if (rp->drag) { --
