[Scummvm-git-logs] scummvm master -> 41eb01ff58d619604b3e156c92d3070083e03ae9

[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:
41eb01ff58 DIRECTOR: Fix warlock-mac crash


Commit: 41eb01ff58d619604b3e156c92d3070083e03ae9
    https://github.com/scummvm/scummvm/commit/41eb01ff58d619604b3e156c92d3070083e03ae9
Author: djsrv (dservilla at gmail.com)
Date: 2020-07-02T15:17:37-04:00

Commit Message:
DIRECTOR: Fix warlock-mac crash

Changed paths:
    engines/director/director.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index a2cbfafddd..03de3de956 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -278,8 +278,11 @@ Common::Error DirectorEngine::run() {
 
 			_currentPath = getPath(_nextMovie.movie, _currentPath);
 
-			Cast *sharedCast = _currentMovie->getSharedCast();
-			_currentMovie->_sharedCast = nullptr;
+			Cast *sharedCast = nullptr;
+			if (_currentMovie) {
+				_currentMovie->getSharedCast();
+				_currentMovie->_sharedCast = nullptr;
+			}
 
 			delete _currentMovie;
 			_currentMovie = nullptr;