Skip to content

Commit a0f75b2

Browse files
committed
Fix popToSceneStackLevel bug in Director
1 parent b2229a5 commit a0f75b2

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

cocos2d/core/CCDirector.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -726,12 +726,12 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
726726
var locScenesStack = this._scenesStack;
727727
var c = locScenesStack.length;
728728

729-
if (c === 0) {
729+
if (level === 0) {
730730
this.end();
731731
return;
732732
}
733-
// current level or lower -> nothing
734-
if (level > c)
733+
// stack overflow
734+
if (level >= c)
735735
return;
736736

737737
// pop stack until reaching desired level
@@ -745,7 +745,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
745745
c--;
746746
}
747747
this._nextScene = locScenesStack[locScenesStack.length - 1];
748-
this._sendCleanupToScene = false;
748+
this._sendCleanupToScene = true;
749749
},
750750

751751
/**

0 commit comments

Comments
 (0)