aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/director/director.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 13b86adb25..cc48b0492f 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -191,7 +191,8 @@ Common::Error DirectorEngine::run() {
while (loop) {
loop = false;
- _currentScore->loadArchive();
+ if (_currentScore)
+ _currentScore->loadArchive();
// If we came in a loop, then skip as requested
if (!_nextMovie.frameS.empty()) {
@@ -232,6 +233,11 @@ Common::Error DirectorEngine::run() {
if (!mov) {
warning("nextMovie: No score is loaded");
+ if (getGameID() == GID_TESTALL) {
+ loop = true;
+ continue;
+ }
+
return Common::kNoError;
}