From 7b2792328153024ef8ffd23050393ddb3098f6b0 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 13 May 2011 23:01:02 +0200
Subject: SCI: Avoid incrementing lockers of deleted script

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 be5d448d.
(cherry picked from commit c01fed7159c313680e55458efb6529d332ebc8b0)
---
 engines/sci/engine/kscripts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sci/engine/kscripts.cpp')

diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp
index b9baa3540a..605998c874 100644
--- a/engines/sci/engine/kscripts.cpp
+++ b/engines/sci/engine/kscripts.cpp
@@ -262,7 +262,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);
 	}
-- 
cgit v1.2.3