From 3e0c287da26d25df9883141d0d6c64d4f0901026 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 7 Aug 2017 10:40:17 -0400 Subject: [PATCH] evas image: add checks for ENDT existence during image free this is null e.g., during enlightenment restart and causes crashes, probably should be removed after underlying cause is resolved @jpeg --- src/lib/evas/canvas/evas_object_image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index f6ed6ad0d5..47128cb2bd 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -1495,7 +1495,7 @@ evas_object_image_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) if (o->cur->scene) _evas_image_3d_unset(eo_obj, obj, o); if (obj->layer && obj->layer->evas) { - if (o->engine_data) + if (o->engine_data && ENDT) { if (o->preloading) { @@ -1504,7 +1504,7 @@ evas_object_image_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) } ENFN->image_free(ENDT, o->engine_data); } - if (o->engine_data_prep) + if (o->engine_data_prep && ENDT) { ENFN->image_free(ENDT, o->engine_data_prep); }