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

[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:
e28fae39a0 DIRECTOR: Do not complain in Window::ensureMovieIsLoaded() when it is loaded


Commit: e28fae39a036e04ed141c120f5a5b567b9c7d616
    https://github.com/scummvm/scummvm/commit/e28fae39a036e04ed141c120f5a5b567b9c7d616
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-12-24T03:14:25+01:00

Commit Message:
DIRECTOR: Do not complain in Window::ensureMovieIsLoaded() when it is loaded

Changed paths:
    engines/director/window.cpp


diff --git a/engines/director/window.cpp b/engines/director/window.cpp
index 701e5494dd1..2458e703126 100644
--- a/engines/director/window.cpp
+++ b/engines/director/window.cpp
@@ -343,6 +343,8 @@ void Window::ensureMovieIsLoaded() {
 			Common::String movieName = getName();
 			setNextMovie(movieName);
 		}
+	} else if (_nextMovie.movie.empty()) { // The movie is loaded and no next movie to load
+		return;
 	}
 
 	if (_nextMovie.movie.empty()) {