Merge pull request cocos2d#13987 from Dimon4eg/Fix-crash-in-FontFreeType

Fix crash in destructor of FontFreeType
fumingxing2015 · Sep 21, 2015 · b54a06a · b54a06a
2 parents deacab9 + 09b5b7f
commit b54a06a
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/cocos/2d/CCFontFreeType.cpp b/cocos/2d/CCFontFreeType.cpp
@@ -182,13 +182,16 @@ bool FontFreeType::createFontObject(const std::string &fontName, int fontSize)
 
 FontFreeType::~FontFreeType()
 {
-    if (_stroker)
+    if (_FTInitialized)
     {
-        FT_Stroker_Done(_stroker);
-    }
-    if (_fontRef)
-    {
-        FT_Done_Face(_fontRef);
+        if (_stroker)
+        {
+            FT_Stroker_Done(_stroker);
+        }
+        if (_fontRef)
+        {
+            FT_Done_Face(_fontRef);
+        }
     }
 
     s_cacheFontData[_fontName].referenceCount -= 1;