Fix issue #15926

AIGRIND-LLC · web-flow · commit afaa9be8262e · 2017-05-05T16:50:04.000+02:00
diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp
@@ -1754,7 +1754,7 @@ Sprite* Label::getLetter(int letterIndex)
         if (_textSprite == nullptr && letterIndex < _lengthOfString)
         {
             const auto &letterInfo = _lettersInfo[letterIndex];
-            if (!letterInfo.valid)
+            if (!letterInfo.valid || letterInfo.atlasIndex<0)
             {
                 break;
             }

Original file line number	Diff line number	Diff line change
`@@ -1754,7 +1754,7 @@ Sprite* Label::getLetter(int letterIndex)`
`1754`	`1754`	`if (_textSprite == nullptr && letterIndex < _lengthOfString)`
`1755`	`1755`	`{`
`1756`	`1756`	`const auto &letterInfo = _lettersInfo[letterIndex];`
`1757`		`- if (!letterInfo.valid)`
	`1757`	`+ if (!letterInfo.valid \|\| letterInfo.atlasIndex<0)`
`1758`	`1758`	`{`
`1759`	`1759`	`break;`
`1760`	`1760`	`}`