diff options
| author | agent-q | 2011-05-21 16:01:26 +0100 |
|---|---|---|
| committer | agent-q | 2011-05-21 16:01:26 +0100 |
| commit | 92d0216db18c96c97bb4b57ada76cf532838cf5b (patch) | |
| tree | 6d405ce821d055403a10aa347e8ae2826917bba1 /engines/sci/engine/kscripts.cpp | |
| parent | 4076a0466d67d42f093e3e73a30ea48e1e1d59e9 (diff) | |
| parent | dd6b5698b181532b37cba41b1475b01813aadddc (diff) | |
| download | scummvm-rg350-92d0216db18c96c97bb4b57ada76cf532838cf5b.tar.gz scummvm-rg350-92d0216db18c96c97bb4b57ada76cf532838cf5b.tar.bz2 scummvm-rg350-92d0216db18c96c97bb4b57ada76cf532838cf5b.zip | |
Merge branch 'branch-1-3-0' of https://github.com/scummvm/scummvm into branch-1-3-0
Diffstat (limited to 'engines/sci/engine/kscripts.cpp')
| -rw-r--r-- | engines/sci/engine/kscripts.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |