[Scummvm-git-logs] scummvm master -> 50084ef84b2f0b77ebab92a363edf823e542b1c1

[sluicebox]

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

Summary:
50084ef84b PRIVATE: Update skip memory video logic


Commit: 50084ef84b2f0b77ebab92a363edf823e542b1c1
    https://github.com/scummvm/scummvm/commit/50084ef84b2f0b77ebab92a363edf823e542b1c1
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2025-12-15T10:55:34-08:00

Commit Message:
PRIVATE: Update skip memory video logic

Fixes border clicks during introduction

Changed paths:
    engines/private/private.cpp


diff --git a/engines/private/private.cpp b/engines/private/private.cpp
index 37da05d4c04..caed5bb27e2 100644
--- a/engines/private/private.cpp
+++ b/engines/private/private.cpp
@@ -3045,9 +3045,8 @@ int PrivateEngine::getMaxLocationValue() {
 }
 
 bool PrivateEngine::selectSkipMemoryVideo(Common::Point mousePos) {
-	// if a video is playing in mode 0 then it is a memory video.
-	// (this is mode 2 in the original, but we don't use kGoThumbnailMovie)
-	if (_mode == 0 && _videoDecoder != nullptr) {
+	// this is mode 2 in the original, but we don't use kGoThumbnailMovie
+	if (_mode == 0 && _videoDecoder != nullptr && _currentSetting == getDiaryMiddleSetting()) {
 		const uint32 tol = 15;
 		const Common::Point origin(kOriginOne[0], kOriginOne[1]);
 		const Common::Rect window(origin.x - tol, origin.y - tol, _screenW - origin.x + tol, _screenH - origin.y + tol);