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

Merge pull request #2839 from minggo/master 

fix some memory leak
This commit is contained in:
minggo 2013-06-09 00:06:13 -07:00
parent 40b41fd804 ec7bf7a9d6
commit caaf2137d8
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos2dx/textures/CCTextureCache.cpp
View File

@ -232,6 +232,7 @@ CCDictionary* CCTextureCache::snapshotTextures()
{
pRet->setObject(pElement->getObject(), pElement->getStrKey());
}
pRet->autorelease();
return pRet;
}

21
extensions/GUI/CCControlExtension/CCControlColourPicker.cpp
View File

@ -46,24 +46,9 @@ CCControlColourPicker::CCControlColourPicker()
CCControlColourPicker::~CCControlColourPicker()
{
if (m_background)
{
m_background->removeFromParentAndCleanup(true);
}
if (m_huePicker)
{
m_huePicker->removeFromParentAndCleanup(true);
}
if (m_colourPicker)
{
m_colourPicker->removeFromParentAndCleanup(true);
}
m_background = NULL;
m_huePicker = NULL;
m_colourPicker = NULL;
CC_SAFE_RELEASE(m_background);
CC_SAFE_RELEASE(m_huePicker);
CC_SAFE_RELEASE(m_colourPicker);
}
bool CCControlColourPicker::init()

2
extensions/network/WebSocket.cpp
View File

@ -556,6 +556,8 @@ int WebSocket::onSocketCallback(struct libwebsocket_context *ctx,
CC_SAFE_DELETE(data);
CC_SAFE_DELETE_ARRAY(buf);
}
CC_SAFE_DELETE(subThreadMsg);
}
_wsHelper->_subThreadWsMessageQueue->clear();