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

Merge pull request #5815 from dumganhar/develop 

Reverts changes in CCApplication.cpp/.mm, pollEvent must after main loop, otherwise, potential crash will happen.
This commit is contained in:
James Chen 2014-03-15 00:14:10 +08:00
parent d0bb70ef52 a8c960c7f1
commit 7337f87cb7
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/2d/platform/linux/CCApplication.cpp
View File

@ -83,9 +83,8 @@ int Application::run()
{ {
lastTime = getCurrentMillSecond(); lastTime = getCurrentMillSecond();
// Poll event before mainloop
glview->pollEvents();
director->mainLoop(); director->mainLoop();
glview->pollEvents();
curTime = getCurrentMillSecond(); curTime = getCurrentMillSecond();
if (curTime - lastTime < _animationInterval) if (curTime - lastTime < _animationInterval)

3
cocos/2d/platform/mac/CCApplication.mm
View File

@ -82,9 +82,8 @@ int Application::run()
{ {
lastTime = getCurrentMillSecond(); lastTime = getCurrentMillSecond();
// Poll event before mainloop
glview->pollEvents();
director->mainLoop(); director->mainLoop();
glview->pollEvents();
curTime = getCurrentMillSecond(); curTime = getCurrentMillSecond();
if (curTime - lastTime < _animationInterval) if (curTime - lastTime < _animationInterval)

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

@ -89,9 +89,8 @@ int Application::run()
{ {
nLast.QuadPart = nNow.QuadPart; nLast.QuadPart = nNow.QuadPart;
// Poll event before mainloop
glview->pollEvents();
director->mainLoop(); director->mainLoop();
glview->pollEvents();
} }
else else
{ {