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

Merge pull request #3705 from dumganhar/iss2087-new-event-dispatcher 

issue #2087: [EventDispatcher] Fixing crash on Win32.
This commit is contained in:
James Chen 2013-09-18 19:17:51 -07:00
parent e201cff032 7797fad5a5
commit 4b3b69bb6b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cocos2dx/event_dispatcher/CCEventDispatcher.cpp
View File

@ -173,6 +173,7 @@ void EventDispatcher::removeEventListener(EventListener* listener)
{ {
if ((*itemIter)->listener == listener) if ((*itemIter)->listener == listener)
{ {
CC_SAFE_RETAIN(listener);
(*itemIter)->listener->_isRegistered = false; (*itemIter)->listener->_isRegistered = false;
(*itemIter)->listener->release(); (*itemIter)->listener->release();
if (_inDispatch == 0) if (_inDispatch == 0)
@ -192,11 +193,10 @@ void EventDispatcher::removeEventListener(EventListener* listener)
if (iter->second->empty()) if (iter->second->empty())
{ {
_priorityDirtyFlagMap.erase(listener->_type);
auto list = iter->second; auto list = iter->second;
iter = _listeners.erase(iter); iter = _listeners.erase(iter);
CC_SAFE_DELETE(list); CC_SAFE_DELETE(list);
_priorityDirtyFlagMap.erase(listener->_type);
} }
else else
{ {
@ -206,6 +206,11 @@ void EventDispatcher::removeEventListener(EventListener* listener)
if (isFound) if (isFound)
break; break;
} }
if (isFound)
{
CC_SAFE_RELEASE(listener);
}
} }
void EventDispatcher::setPriority(EventListener* listener, int fixedPriority) void EventDispatcher::setPriority(EventListener* listener, int fixedPriority)