[Scummvm-git-logs] scummvm branch-2-1 -> 0ca2048d96e77462ba714eeaf2382a0a2608c2e0

[sluicebox]

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:
0ca2048d96 SCI32: Fix VMDPlayer not leaving last frame


Commit: 0ca2048d96e77462ba714eeaf2382a0a2608c2e0
    https://github.com/scummvm/scummvm/commit/0ca2048d96e77462ba714eeaf2382a0a2608c2e0
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-01-05T00:58:07-08:00

Commit Message:
SCI32: Fix VMDPlayer not leaving last frame

Applies _leaveLastFrame logic from VMDPlayer::closeComposited() to
VMDPlayer::closeOverlay() where it was missing.

Fixes bug #11299 in GK2

Changed paths:
    engines/sci/graphics/video32.cpp


diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp
index 567660d9..be62ba7 100644
--- a/engines/sci/graphics/video32.cpp
+++ b/engines/sci/graphics/video32.cpp
@@ -936,7 +936,9 @@ void VMDPlayer::closeOverlay() {
 	}
 #endif
 
-	g_sci->_gfxFrameout->frameOut(true, _drawRect);
+	if (!_leaveLastFrame && _leaveScreenBlack) {
+		g_sci->_gfxFrameout->frameOut(true, _drawRect);
+	}
 }
 
 void VMDPlayer::initComposited() {