Merge pull request #637 from dumganhar/fix/fire-5727-v1.5

fix pauseAllEventListenersForTarget couldn't work while dispatching touch event.
This commit is contained in:
Wang Nan
2017-05-19 11:27:47 +08:00
committed by GitHub
3 changed files with 5 additions and 3 deletions
+2
View File
@@ -207,6 +207,8 @@ void Node::cleanup()
this->stopAllActions();
// timers
this->unscheduleAllCallbacks();
_eventDispatcher->removeEventListenersForTarget(this);
for( const auto &child: _children)
child->cleanup();
+2 -2
View File
@@ -477,9 +477,9 @@ void EventDispatcher::forceAddEventListener(EventListener* listener)
associateNodeAndEventListener(node, listener);
if (node->isRunning())
if (!node->isRunning())
{
resumeEventListenersForTarget(node);
listener->setPaused(true);
}
}
else
+1 -1
View File
@@ -41,7 +41,7 @@ bool EventListener::init(Type t, const ListenerID& listenerID, const std::functi
_type = t;
_listenerID = listenerID;
_isRegistered = false;
_paused = true;
_paused = false;
_isEnabled = true;
return true;