Fix popToSceneStackLevel bug in Director

cocos2d · Nov 25, 2015 · a0f75b2 · a0f75b2
1 parent b2229a5
commit a0f75b2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/cocos2d/core/CCDirector.js b/cocos2d/core/CCDirector.js
@@ -726,12 +726,12 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
         var locScenesStack = this._scenesStack;
         var c = locScenesStack.length;
 
-        if (c === 0) {
+        if (level === 0) {
             this.end();
             return;
         }
-        // current level or lower -> nothing
-        if (level > c)
+        // stack overflow
+        if (level >= c)
             return;
 
         // pop stack until reaching desired level
@@ -745,7 +745,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
             c--;
         }
         this._nextScene = locScenesStack[locScenesStack.length - 1];
-        this._sendCleanupToScene = false;
+        this._sendCleanupToScene = true;
     },
 
     /**