From 483cec924bff9bd2a803dcb2fef161759f302f8d Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Thu, 5 Nov 2015 09:41:35 +0900 Subject: [PATCH] evas - patch in one more if check for obj layer to avoid shutdown crash this should fix T2715 --- src/lib/evas/canvas/evas_object_textblock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 3d302e87eb..d579efdafa 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -816,7 +816,8 @@ _format_unref_free(const Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt) if (fmt->ref > 0) return; if (fmt->font.fdesc) evas_font_desc_unref(fmt->font.fdesc); if (fmt->font.source) eina_stringshare_del(fmt->font.source); - evas_font_free(obj->layer->evas->evas, fmt->font.font); + if ((obj->layer) && (obj->layer->evas)) + evas_font_free(obj->layer->evas->evas, fmt->font.font); free(fmt); }