sync 19661: Clear the scene stack in the expected order (#19935)

minggo · web-flow · commit 956fd854015a · 2019-07-19T16:53:20.000+08:00
diff --git a/cocos/base/CCDirector.cpp b/cocos/base/CCDirector.cpp
@@ -995,7 +995,12 @@ void Director::reset()
         }
     }
 #endif // CC_ENABLE_GC_FOR_NATIVE_OBJECTS
-    _scenesStack.clear();
+    
+    while (!_scenesStack.empty())
+    {
+        _scenesStack.popBack();
+    }
+
     
     stopAnimation();
     

Original file line number	Diff line number	Diff line change
`@@ -995,7 +995,12 @@ void Director::reset()`
`995`	`995`	`}`
`996`	`996`	`}`
`997`	`997`	`#endif // CC_ENABLE_GC_FOR_NATIVE_OBJECTS`
`998`		`- _scenesStack.clear();`
	`998`	`+`
	`999`	`+ while (!_scenesStack.empty())`
	`1000`	`+ {`
	`1001`	`+ _scenesStack.popBack();`
	`1002`	`+ }`
	`1003`	`+`
`999`	`1004`
`1000`	`1005`	`stopAnimation();`
`1001`	`1006`