enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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
This commit is contained in:
Mike Blumenkrantz 2019-07-19 15:43:21 -04:00 committed by Cedric BAIL
parent 0084d8d736
commit 734637c42c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/edje/edje_entry.c
View File

@ -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

3
src/lib/edje/edje_load.c
View File

@ -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)
{