diff options
| -rw-r--r-- | engines/sci/engine/klists.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp index 53be26b37f..bc559148ac 100644 --- a/engines/sci/engine/klists.cpp +++ b/engines/sci/engine/klists.cpp @@ -576,6 +576,10 @@ reg_t kListEachElementDo(EngineState *s, int argc, reg_t *argv) { } } else { invokeSelector(s, curObject, slc, argc, argv, argc - 2, argv + 2); + // Check if the list has been invalidated after the call above + // (e.g. when restoring in Torin) + if (s->_segMan->getSegmentType(argv[0].getSegment()) != SEG_TYPE_LISTS) + return s->r_acc; } curNode = s->_segMan->lookupNode(list->nextNodes[list->numRecursions]); |