[Scummvm-git-logs] scummvm master -> b60275e1047d4c45fbe5cd230e5fe49e3cd87a1c

[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:
b60275e104 DIRECTOR: Gracefully process case when there is no startup file specified


Commit: b60275e1047d4c45fbe5cd230e5fe49e3cd87a1c
    https://github.com/scummvm/scummvm/commit/b60275e1047d4c45fbe5cd230e5fe49e3cd87a1c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-05-29T22:21:23+02:00

Commit Message:
DIRECTOR: Gracefully process case when there is no startup file specified

Changed paths:
    engines/director/resource.cpp


diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index efa7c02eefa..3c664271942 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -55,6 +55,9 @@ Common::Error Window::loadInitialMovie() {
 	debug(0, "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n");
 	Common::String movie = (_vm->getGameGID() == GID_TESTALL) ? getNextMovieFromQueue().movie : _vm->getEXEName();
 
+	if (movie.empty())
+		return Common::kPathNotFile;
+
 	loadINIStream();
 	_mainArchive = openArchive(movie);
 
@@ -100,7 +103,7 @@ Common::Error Window::loadInitialMovie() {
 	}
 
 	_currentMovie->setArchive(_mainArchive);
-	_currentMovie->getScore()->_skipTransition = true; 
+	_currentMovie->getScore()->_skipTransition = true;
 	// XLibs are usually loaded in the initial movie.
 	// These may not be present if a --start-movie is specified, so
 	// we sometimes need to load them manually.