Merge pull request #1780 from dumganhar/gles20

fixed #1622: Crash occurs when cc.Node.getChildren is invoked if there are no children.
This commit is contained in:
James Chen 2012-12-23 19:56:25 -08:00
commit 1f79603d26
1 changed files with 3 additions and 3 deletions

View File

@ -170,10 +170,10 @@ JSBool js_cocos2dx_CCNode_getChildren(JSContext *cx, uint32_t argc, jsval *vp)
if (proxy) {
cocos2d::CCNode *node = (cocos2d::CCNode *)(proxy->ptr ? proxy->ptr : NULL);
cocos2d::CCArray *children = node->getChildren();
unsigned int count = children ? children->count() : 0;
JSObject *jsarr = JS_NewArrayObject(cx, count, NULL);
JSObject *jsarr = JS_NewArrayObject(cx, children->count(), NULL);
for (unsigned int i=0; i < children->count(); i++) {
for (unsigned int i=0; i < count; i++) {
cocos2d::CCNode *child = (cocos2d::CCNode*)children->objectAtIndex(i);
js_proxy_t *childProxy = js_get_or_create_proxy<cocos2d::CCNode>(cx, child);
jsval childVal = OBJECT_TO_JSVAL(childProxy->obj);