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

Merge pull request #3698 from minggo/develop 

make Director::end() reantrant
This commit is contained in:
minggo 2013-09-18 08:58:44 -07:00
parent ec7cfae4e8 a901efb603
commit fa71f8f479
4 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos2dx/CCDirector.cpp
View File

@ -704,8 +704,11 @@ void Director::purgeDirector()
CHECK_GL_ERROR_DEBUG();
// OpenGL view
_openGLView->end();
_openGLView = nullptr;
if (_openGLView)
{
_openGLView->end();
_openGLView = nullptr;
}
// delete Director
release();

10
cocos2dx/kazmath/src/GL/mat4stack.c
View File

@ -66,8 +66,14 @@ void km_mat4_stack_pop(km_mat4_stack* stack, kmMat4* pOut)
stack->top = &stack->stack[stack->item_count - 1];
}
void km_mat4_stack_release(km_mat4_stack* stack) {
free(stack->stack);
void km_mat4_stack_release(km_mat4_stack* stack)
{
if (stack->stack)
{
free(stack->stack);
stack->stack = NULL;
}
stack->top = NULL;
stack->item_count = 0;
stack->capacity = 0;

1
cocos2dx/support/user_default/CCUserDefault.mm
View File

@ -503,6 +503,7 @@ UserDefault* UserDefault::getInstance()
void UserDefault::destroyInstance()
{
delete _userDefault;
_userDefault = NULL;
}

15
cocos2dx/textures/CCTextureCache.cpp
View File

@ -89,12 +89,15 @@ TextureCache::~TextureCache()
void TextureCache::destroyInstance()
{
// notify sub thread to quick
_sharedTextureCache->_needQuit = true;
_sharedTextureCache->_sleepCondition.notify_one();
if (_sharedTextureCache->_loadingThread) _sharedTextureCache->_loadingThread->join();
CC_SAFE_RELEASE_NULL(_sharedTextureCache);
if (_sharedTextureCache)
{
// notify sub thread to quick
_sharedTextureCache->_needQuit = true;
_sharedTextureCache->_sleepCondition.notify_one();
if (_sharedTextureCache->_loadingThread) _sharedTextureCache->_loadingThread->join();
CC_SAFE_RELEASE_NULL(_sharedTextureCache);
}
}
const char* TextureCache::description() const