[Scummvm-git-logs] scummvm master -> 6e6eba799235cd037bc99c024bf6233ff8eaa59e

[sev-]

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:
6e6eba7992 DIRECTOR: Fix crash when no shared cast is present


Commit: 6e6eba799235cd037bc99c024bf6233ff8eaa59e
    https://github.com/scummvm/scummvm/commit/6e6eba799235cd037bc99c024bf6233ff8eaa59e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-24T22:36:18+01:00

Commit Message:
DIRECTOR: Fix crash when no shared cast is present

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 2b08bb22b2..572c299aef 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -319,7 +319,7 @@ void Score::loadSpriteImages(bool isSharedCast) {
 
 		if (_loadedCast->contains(imgId)) {
 			pic = sharedScore->getArchive()->getResource(tag, imgId);
-		} else if (sharedScore->_loadedCast && sharedScore->_loadedCast->contains(imgId)) {
+		} else if (sharedScore && sharedScore->_loadedCast && sharedScore->_loadedCast->contains(imgId)) {
 			bitmapCast->_tag = tag = ((BitmapCast *)sharedScore->_loadedCast->getVal(imgId))->_tag;
 			pic = sharedScore->getArchive()->getResource(tag, imgId);
 		}