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

Merge pull request #6999 from iSevenDays/patch-12 

fix assertions
This commit is contained in:
minggo 2014-06-09 09:46:55 +08:00
parent 7e6fc3b9ac 3edef12094
commit 575c5101c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/GUI/CCControlExtension/CCControlButton.cpp
View File

@ -71,10 +71,10 @@ bool ControlButton::initWithLabelAndBackgroundSprite(Node* node, Scale9Sprite* b
{ {
if (Control::init()) if (Control::init())
{ {
CCASSERT(node != nullptr, "Label must not be nil."); CCASSERT(node != nullptr, "node must not be nil.");
LabelProtocol* label = dynamic_cast<LabelProtocol*>(node); LabelProtocol* label = dynamic_cast<LabelProtocol*>(node);
CCASSERT(backgroundSprite != nullptr, "Background sprite must not be nil."); CCASSERT(backgroundSprite != nullptr, "Background sprite must not be nil.");
CCASSERT(label != nullptr || backgroundSprite != nullptr, ""); CCASSERT(label != nullptr, "label must not be nil.");
_parentInited = true; _parentInited = true;