[Scummvm-git-logs] scummvm master -> 9588640252e099fa699ff49efc2ac35e5def67c2

[djsrv]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9588640252 DIRECTOR: LINGO: Fix executeScript


Commit: 9588640252e099fa699ff49efc2ac35e5def67c2
    https://github.com/scummvm/scummvm/commit/9588640252e099fa699ff49efc2ac35e5def67c2
Author: djsrv (dservilla at gmail.com)
Date: 2020-07-10T15:11:19-04:00

Commit Message:
DIRECTOR: LINGO: Fix executeScript

Changed paths:
    engines/director/lingo/lingo.cpp


diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 5a15e41fd7..0b6548daef 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -607,7 +607,12 @@ void Lingo::executeScript(ScriptType type, uint16 id) {
 	ScriptContext *sc = movie->getScriptContext(type, id);
 
 	if (!sc) {
-		debugC(3, kDebugLingoExec, "Request to execute non-existant script type %d id %d", type, id);
+		debugC(3, kDebugLingoExec, "Request to execute non-existent script type %d id %d", type, id);
+		return;
+	}
+
+	if (!sc->_eventHandlers.contains(kEventScript)) {
+		debugC(3, kDebugLingoExec, "Request to execute script type %d id %d with no scopeless lingo", type, id);
 		return;
 	}