summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-11-05 09:41:35 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-11-05 09:41:35 +0900
commit483cec924bff9bd2a803dcb2fef161759f302f8d (patch)
treee3ad06f6c7f18086a23dbc82bcaa440710b165c9
parent6b1af3c55abefd5cb1e1a0218900e763dcbad31b (diff)
evas - patch in one more if check for obj layer to avoid shutdown crash
this should fix T2715
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c3
1 files changed, 2 insertions, 1 deletions
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)
816 if (fmt->ref > 0) return; 816 if (fmt->ref > 0) return;
817 if (fmt->font.fdesc) evas_font_desc_unref(fmt->font.fdesc); 817 if (fmt->font.fdesc) evas_font_desc_unref(fmt->font.fdesc);
818 if (fmt->font.source) eina_stringshare_del(fmt->font.source); 818 if (fmt->font.source) eina_stringshare_del(fmt->font.source);
819 evas_font_free(obj->layer->evas->evas, fmt->font.font); 819 if ((obj->layer) && (obj->layer->evas))
820 evas_font_free(obj->layer->evas->evas, fmt->font.font);
820 free(fmt); 821 free(fmt);
821} 822}
822 823