thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TIMER: Remove name of callback in removeTimerProc.

Browse source 
This should fix #3389673 "LOOM: CD-Version crashes at start". It also fixes the
same error showing up for me in Monkey CD.

The doc changes in 4c7958450f claims the name is used for the event
recorder, but as far as I can tell it is not used right now. Thus depending on
how it is used the behavior of SCUMM removing and adding the same timer aagain
*might* cause problems.

In any way we need to remove the name in removeTimerProc, else RTL + launching
the same game again would be broken too.
This commit is contained in:
Johannes Schickel 2011-08-10 18:15:00 +02:00
parent f049e6788a
commit cea06991eb
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
backends/timer/default/default-timer.cpp
View file

@ -161,4 +161,11 @@ void DefaultTimerManager::removeTimerProc(TimerProc callback) {
slot = slot->next;
}
}
for (TimerSlotMap::iterator i = _callbacks.begin(), end = _callbacks.end(); i != end; ++i) {
if (i->_value == callback) {
_callbacks.erase(i);
break;
}
}
}