[EGIT] [core/efl] master 01/01: evas - patch in one more if check for obj layer to avoid shutdown crash

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=483cec924bff9bd2a803dcb2fef161759f302f8d

commit 483cec924bff9bd2a803dcb2fef161759f302f8d
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Thu Nov 5 09:41:35 2015 +0900

    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 3d302e8..d579efd 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);
 }
 

--