[Scummvm-cvs-logs] CVS: scummvm/saga sthread.cpp,1.83,1.84
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Wed Jun 15 13:09:23 CEST 2005
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30196
Modified Files:
sthread.cpp
Log Message:
Don't access the thread after sfScriptGotoScene. As the comment points out,
the thread has been destroyed. This fixes a crash when leaving the ferret
guild lodge, and probably other places as well.
Index: sthread.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sthread.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- sthread.cpp 15 Jun 2005 19:26:32 -0000 1.83
+++ sthread.cpp 15 Jun 2005 20:07:56 -0000 1.84
@@ -347,12 +347,12 @@
(this->*scriptFunction)(thread, argumentsCount);
- thread->_stackTopIndex = checkStackTopIndex;
-
if (scriptFunction == &Saga::Script::sfScriptGotoScene) {
return true; // cause abortAllThreads called and _this_ thread destroyed
}
+ thread->_stackTopIndex = checkStackTopIndex;
+
if (operandChar == opCcall) {// CALL function
thread->push(thread->_returnValue);
}
More information about the Scummvm-git-logs
mailing list