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

[lephilousophe]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
969b6ee54a QDENGINE: Fix double free
f77c31a8ca QDENGINE: Fix playing intro videos when one fails


Commit: 969b6ee54acc289e8fa25a18955242a336f8bccb
    https://github.com/scummvm/scummvm/commit/969b6ee54acc289e8fa25a18955242a336f8bccb
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-09-06T19:01:22+02:00

Commit Message:
QDENGINE: Fix double free

The stream has already been deleted by the video decoder

Changed paths:
    engines/qdengine/qdcore/util/WinVideo.cpp


diff --git a/engines/qdengine/qdcore/util/WinVideo.cpp b/engines/qdengine/qdcore/util/WinVideo.cpp
index c07d675cebb..67f89ab279f 100644
--- a/engines/qdengine/qdcore/util/WinVideo.cpp
+++ b/engines/qdengine/qdcore/util/WinVideo.cpp
@@ -81,12 +81,13 @@ bool winVideo::open_file(const Common::Path fname) {
 	if (!_videostream->open(filename.c_str())) {
 		warning("WinVideo::open: Failed to open file %s", filename.c_str());
 		delete _videostream;
+		_videostream = nullptr;
 		return false;
 	}
 
 	if (!_decoder->loadStream(_videostream)) {
-		warning("WinVideo::play: Failed to Load Stream");
-		delete _videostream;
+		warning("WinVideo::open: Failed to Load Stream");
+		_videostream = nullptr;
 		return false;
 	}
 


Commit: f77c31a8ca8963730c0dca8928fb38e7b7268a81
    https://github.com/scummvm/scummvm/commit/f77c31a8ca8963730c0dca8928fb38e7b7268a81
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-09-06T19:18:43+02:00

Commit Message:
QDENGINE: Fix playing intro videos when one fails

Changed paths:
    engines/qdengine/qdcore/qd_game_dispatcher.cpp


diff --git a/engines/qdengine/qdcore/qd_game_dispatcher.cpp b/engines/qdengine/qdcore/qd_game_dispatcher.cpp
index bd13f002a9c..10f95e39dce 100644
--- a/engines/qdengine/qdcore/qd_game_dispatcher.cpp
+++ b/engines/qdengine/qdcore/qd_game_dispatcher.cpp
@@ -1947,8 +1947,9 @@ bool qdGameDispatcher::close_video() {
 		if (it != video_list().end()) ++it;
 		for (; it != video_list().end(); ++it) {
 			if ((*it)->is_intro_movie()) {
-				play_video(*it);
-				return true;
+				if (play_video(*it)) {
+					return true;
+				}
 			}
 		}