Skip to content

Commit b60275e

Browse files
committed
DIRECTOR: Gracefully process case when there is no startup file specified
1 parent 0803963 commit b60275e

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

engines/director/resource.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ Common::Error Window::loadInitialMovie() {
5555
debug(0, "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n");
5656
Common::String movie = (_vm->getGameGID() == GID_TESTALL) ? getNextMovieFromQueue().movie : _vm->getEXEName();
5757

58+
if (movie.empty())
59+
return Common::kPathNotFile;
60+
5861
loadINIStream();
5962
_mainArchive = openArchive(movie);
6063

@@ -100,7 +103,7 @@ Common::Error Window::loadInitialMovie() {
100103
}
101104

102105
_currentMovie->setArchive(_mainArchive);
103-
_currentMovie->getScore()->_skipTransition = true;
106+
_currentMovie->getScore()->_skipTransition = true;
104107
// XLibs are usually loaded in the initial movie.
105108
// These may not be present if a --start-movie is specified, so
106109
// we sometimes need to load them manually.

0 commit comments

Comments
 (0)