Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

check if _currentUTF16String is null

This commit is contained in:
Dale Stammen 2014-04-19 09:38:45 -07:00
parent 9cf463bf6a
commit 8f14597717
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCFontAtlas.cpp
View File

@ -221,7 +221,7 @@ bool FontAtlas::getLetterDefinitionForChar(unsigned short letteCharUTF16, FontL
bool FontAtlas::prepareLetterDefinitions(unsigned short *utf16String)
{
FontFreeType* fontTTf = dynamic_cast<FontFreeType*>(_font);
if(fontTTf == nullptr)
if(fontTTf == nullptr || utf16String == nullptr)
return false;
int length = cc_wcslen(utf16String);

2
cocos/2d/CCLabel.cpp
View File

@ -571,7 +571,7 @@ float Label::getScaleX() const
void Label::alignText()
{
if (_fontAtlas == nullptr)
if (_fontAtlas == nullptr || _currentUTF16String == nullptr)
{
return;
}