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

Merge pull request #5283 from seemk/director_cleanup_fix 

closed #4099: Fixed crashing when calling CCDirector's end() on win32.
This commit is contained in:
James Chen 2014-02-24 16:58:34 +08:00
parent 75f513d4b1 881757a792
commit 1b91234325
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/2d/platform/desktop/CCGLView.cpp
View File

@ -486,7 +486,11 @@ bool GLView::isOpenGLReady()
void GLView::end()
{
if(_mainWindow)
{
glfwSetWindowShouldClose(_mainWindow,1);
_mainWindow = nullptr;
}
}
void GLView::swapBuffers()

10
cocos/2d/platform/win32/CCApplication.cpp
View File

@ -94,13 +94,13 @@ int Application::run()
}
}
/* Only work on Desktop
* Director::mainLoop is really one frame logic
* when we want to close the window, we should call Director::end();
* then call Director::mainLoop to do release of internal resources
*/
// Director should still do a cleanup if the window was closed manually.
if (glview->isOpenGLReady())
{
director->end();
director->mainLoop();
director = nullptr;
}
return true;
}