MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes mistake in EventManager::manageTickEvent

develop
Josh Cooper 2021-08-28 13:06:56 -07:00 committed by Myk
parent b8ad0131ea
commit 6ace4b2cf8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/modules/EventManager.cpp
Unescape Escape View File

@ -380,13 +380,16 @@ static void manageTickEvent(color_ostream& out) {
return; return;
for (auto iter = handlers[EventType::TICK].begin(); iter != handlers[EventType::TICK].end(); ) { for (auto iter = handlers[EventType::TICK].begin(); iter != handlers[EventType::TICK].end(); ) {
EventHandler &handle = iter->second; EventHandler &handle = iter->second;
//check if we find a handler registered
if ( toRemove.find(handle) == toRemove.end() ) { if ( toRemove.find(handle) == toRemove.end() ) {
//the event is from registerTick, so things are already cleaned up
++iter; ++iter;
continue; continue;
} }
iter = handlers[EventType::TICK].erase(iter); iter = handlers[EventType::TICK].erase(iter);
toRemove.erase(handle); toRemove.erase(handle);
registerTick(handle, handle.freq, iter->first); //the handler is registered with the listeners, so we want it to keep listening
registerListener(DFHack::EventManager::EventType::TICK, handle, iter->first);
if ( toRemove.empty() ) if ( toRemove.empty() )
break; break;
} }