summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-07-19 15:43:21 -0400
committerCedric BAIL <cedric.bail@free.fr>2019-07-19 15:04:52 -0700
commit734637c42c51e12d0284d22fbe6f2458c213fbab (patch)
treeb680832be5766fe67c18bc6c74b9839686531f95
parent0084d8d73647be73f9c37091c8c683331ad32b24 (diff)
edje: add some null checks for nonexistent objects
minor cleanup to fix EVAS_DEBUG_ABORT usage Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D9361
-rw-r--r--src/lib/edje/edje_entry.c6
-rw-r--r--src/lib/edje/edje_load.c3
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)
3014 3014
3015 if (rp->part->entry_mode >= EDJE_ENTRY_EDIT_MODE_EDITABLE) 3015 if (rp->part->entry_mode >= EDJE_ENTRY_EDIT_MODE_EDITABLE)
3016 { 3016 {
3017 evas_object_show(en->cursor_bg); 3017 if (en->cursor_bg) evas_object_show(en->cursor_bg);
3018 evas_object_show(en->cursor_fg); 3018 if (en->cursor_fg) evas_object_show(en->cursor_fg);
3019 evas_object_show(en->cursor_fg2); 3019 if (en->cursor_fg2) evas_object_show(en->cursor_fg2);
3020 en->input_panel_enable = EINA_TRUE; 3020 en->input_panel_enable = EINA_TRUE;
3021 3021
3022#ifdef HAVE_ECORE_IMF 3022#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
1356 for (i = 0; i < ed->table_parts_size; i++) 1356 for (i = 0; i < ed->table_parts_size; i++)
1357 { 1357 {
1358 rp = ed->table_parts[i]; 1358 rp = ed->table_parts[i];
1359 evas_object_show(rp->object); 1359 /* SPACER parts do not have objects */
1360 if (rp->object) evas_object_show(rp->object);
1360 if (_edje_block_break(ed)) break; 1361 if (_edje_block_break(ed)) break;
1361 if (rp->drag) 1362 if (rp->drag)
1362 { 1363 {