[Scummvm-git-logs] scummvm master -> 53901e7a9d84275cc47d6a7d8d4d0a8b56a651a7

sev- sev at scummvm.org
Fri Jan 10 22:38:54 UTC 2020


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:
53901e7a9d DIRECTOR: Do not crash if movie was not loaded


Commit: 53901e7a9d84275cc47d6a7d8d4d0a8b56a651a7
    https://github.com/scummvm/scummvm/commit/53901e7a9d84275cc47d6a7d8d4d0a8b56a651a7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-10T23:33:08+01:00

Commit Message:
DIRECTOR: Do not crash if movie was not loaded

Changed paths:
    engines/director/director.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 14a63db..66635eb 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -207,7 +207,7 @@ Common::Error DirectorEngine::run() {
 			_nextMovie.frameI = -1;
 		}
 
-		if (!debugChannelSet(-1, kDebugLingoCompileOnly)) {
+		if (!debugChannelSet(-1, kDebugLingoCompileOnly) && _currentScore) {
 			debugC(1, kDebugEvents, "Starting playback of score '%s'", _currentScore->getMacName().c_str());
 
 			_currentScore->startLoop();




More information about the Scummvm-git-logs mailing list