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

Merge pull request #11489 from dumganhar/clean-order 

[Director FIX]: Clean all schedulers and remove all eventlisteners after exiting scene
This commit is contained in:
minggo 2015-04-20 10:47:37 +08:00
parent e7e6a4c8ff 6864a4a7bb
commit bb4e749a93
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cocos/base/CCDirector.cpp
View File

@ -938,15 +938,6 @@ void Director::restart()
void Director::reset() void Director::reset()
{ {
// cleanup scheduler
getScheduler()->unscheduleAll();
// Remove all events
if (_eventDispatcher)
{
_eventDispatcher->removeAllEventListeners();
}
if (_runningScene) if (_runningScene)
{ {
_runningScene->onExit(); _runningScene->onExit();
@ -957,6 +948,15 @@ void Director::reset()
_runningScene = nullptr; _runningScene = nullptr;
_nextScene = nullptr; _nextScene = nullptr;
// cleanup scheduler
getScheduler()->unscheduleAll();
// Remove all events
if (_eventDispatcher)
{
_eventDispatcher->removeAllEventListeners();
}
// remove all objects, but don't release it. // remove all objects, but don't release it.
// runWithScene might be executed after 'end'. // runWithScene might be executed after 'end'.
_scenesStack.clear(); _scenesStack.clear();