Merge pull request #17756 from perminovVS/set-font-atlas-memory-leak

zilongshanren · web-flow · commit 5c3993836e2f · 2017-05-03T17:23:28.000+08:00
Memory leak in setFontAtlas, if set equal font in Label.
diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp
@@ -584,6 +584,10 @@ void Label::setFontAtlas(FontAtlas* atlas,bool distanceFieldEnabled /* = false *
 
     if (atlas == _fontAtlas)
     {
+        if (_fontAtlas)
+        {
+            FontAtlasCache::releaseFontAtlas(_fontAtlas);
+        }
         return;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -584,6 +584,10 @@ void Label::setFontAtlas(FontAtlas* atlas,bool distanceFieldEnabled /* = false *`
`584`	`584`
`585`	`585`	`if (atlas == _fontAtlas)`
`586`	`586`	`{`
	`587`	`+ if (_fontAtlas)`
	`588`	`+ {`
	`589`	`+ FontAtlasCache::releaseFontAtlas(_fontAtlas);`
	`590`	`+ }`
`587`	`591`	`return;`
`588`	`592`	`}`
`589`	`593`