[Scummvm-git-logs] scummvm master -> 04c29cdf0cf70880d1d469947c62bdc062d24932

[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:
04c29cdf0c DIRECTOR: Don't load info for unloaded cast member


Commit: 04c29cdf0cf70880d1d469947c62bdc062d24932
    https://github.com/scummvm/scummvm/commit/04c29cdf0cf70880d1d469947c62bdc062d24932
Author: djsrv (dservilla at gmail.com)
Date: 2020-07-15T21:42:38-04:00

Commit Message:
DIRECTOR: Don't load info for unloaded cast member

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 12984f1c27..701e31efbf 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -993,6 +993,9 @@ void Cast::dumpScript(const char *script, ScriptType type, uint16 id) {
 }
 
 void Cast::loadCastInfo(Common::SeekableSubReadStreamEndian &stream, uint16 id) {
+	if (!_loadedCast->contains(id))
+		return;
+
 	InfoEntries castInfo = Movie::loadInfoEntries(stream);
 
 	debugCN(4, kDebugLoading, "Cast::loadCastInfo(): str(%d): '", castInfo.strings.size());