aboutsummaryrefslogtreecommitdiff
path: root/saga
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-07-31 16:38:15 +0000
committerTorbjörn Andersson2005-07-31 16:38:15 +0000
commitf69544ebd282e025d9e2bfabdc7419bf09bcc23f (patch)
tree434149ef7eb7dfca9ccedd5257fbc6ba6a2eec34 /saga
parent7ae74f3177c2e8d77ae38bea42ef91abc8bb5dc1 (diff)
downloadscummvm-rg350-f69544ebd282e025d9e2bfabdc7419bf09bcc23f.tar.gz
scummvm-rg350-f69544ebd282e025d9e2bfabdc7419bf09bcc23f.tar.bz2
scummvm-rg350-f69544ebd282e025d9e2bfabdc7419bf09bcc23f.zip
Prevent infinite loop in executeThreads() for IHNM. I don't know if this is
the correct behaviour, but surely it's less evil now? svn-id: r18606
Diffstat (limited to 'saga')
-rw-r--r--saga/sthread.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/saga/sthread.cpp b/saga/sthread.cpp
index e12de61fee..c8858c2aed 100644
--- a/saga/sthread.cpp
+++ b/saga/sthread.cpp
@@ -103,7 +103,6 @@ void Script::executeThreads(uint msec) {
ScriptThread *thread;
ScriptThreadList::iterator threadIterator;
-
if (_vm->_interface->_statusTextInput) {
return;
}
@@ -120,6 +119,7 @@ void Script::executeThreads(uint msec) {
if (_vm->getGameType() == GType_IHNM) {
thread->_flags &= ~kTFlagFinished;
thread->_flags |= kTFlagAborted;
+ ++threadIterator;
} else {
threadIterator = _threadList.erase(threadIterator);
}