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

SCI: Avoid incrementing lockers of deleted script

Browse source 
Having a deleted script with non-zero lockers had the side effect of
making the deleted script re-appear in the GC's work list, including
any (deleted) objects in the script.

This should be the root cause of bugs #3299458 and #3295849, so
also delete the workaround added for that in 35086fe1.
This commit is contained in:
Willem Jan Palenstijn 2011-05-13 23:01:02 +02:00
parent 3ed095434f
commit c01fed7159
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/engine/kscripts.cpp
View file

@ -259,7 +259,7 @@ reg_t kDisposeScript(EngineState *s, int argc, reg_t *argv) {
SegmentId id = s->_segMan->getScriptSegment(script);
Script *scr = s->_segMan->getScriptIfLoaded(id);
if (scr) {
if (scr && !scr->isMarkedAsDeleted()) {
if (s->_executionStack.back().addr.pc.segment != id)
scr->setLockers(1);
}