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

Merge commit 'refs/pull/4069/head' of git://github.com/cocos2d/cocos2d-x into eventdispatcher-fix

This commit is contained in:
James Chen 2013-11-02 21:47:24 +08:00
parent 7dc6513687 06f166f613
commit a4b28353a7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cocos/2d/CCEventDispatcher.cpp
View File

@ -442,9 +442,16 @@ void EventDispatcher::removeEventListener(EventListener* listener)
break; break;
} }
if (isFound) if (isFound) {
{
CC_SAFE_RELEASE(listener); CC_SAFE_RELEASE(listener);
} else {
for(auto iter=_toAddedListeners.begin(); iter != _toAddedListeners.end(); ++iter) {
if ((*iter)->listener == listener)
{
_toAddedListeners.erase(iter);
break;
}
}
} }
} }