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

csnover csnover at users.noreply.github.com
Sat Sep 30 18:35:21 CEST 2017


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:
f46fa18006 SCI32: Stop trying to clean up uninitialized VMDs


Commit: f46fa18006755f7ec8e351f095b7b21a497aa6a4
    https://github.com/scummvm/scummvm/commit/f46fa18006755f7ec8e351f095b7b21a497aa6a4
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-30T11:35:08-05:00

Commit Message:
SCI32: Stop trying to clean up uninitialized VMDs

Fixes Trac#10252.

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


diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp
index 736ee15..e837cec 100644
--- a/engines/sci/graphics/video32.cpp
+++ b/engines/sci/graphics/video32.cpp
@@ -599,20 +599,26 @@ VMDPlayer::IOStatus VMDPlayer::close() {
 		return kIOSuccess;
 	}
 
-	if (_isComposited) {
-		closeComposited();
-	} else {
-		closeOverlay();
-	}
+	if (_isInitialized) {
+		if (_isComposited) {
+			closeComposited();
+		} else {
+			closeOverlay();
+		}
 
-	if (_blackoutPlane != nullptr) {
-		g_sci->_gfxFrameout->deletePlane(*_blackoutPlane);
-		_blackoutPlane = nullptr;
-	}
+		if (_blackoutPlane != nullptr) {
+			g_sci->_gfxFrameout->deletePlane(*_blackoutPlane);
+			_blackoutPlane = nullptr;
+		}
 
-	if (!_leaveLastFrame && !_leaveScreenBlack) {
-		// This call *actually* deletes the blackout plane
-		g_sci->_gfxFrameout->frameOut(true);
+		if (!_leaveLastFrame && !_leaveScreenBlack) {
+			// This call *actually* deletes the blackout plane
+			g_sci->_gfxFrameout->frameOut(true);
+		}
+
+		if (!_showCursor) {
+			g_sci->_gfxCursor32->unhide();
+		}
 	}
 
 	_decoder->close();
@@ -622,10 +628,6 @@ VMDPlayer::IOStatus VMDPlayer::close() {
 		_bundledVmd = nullptr;
 	}
 
-	if (!_showCursor) {
-		g_sci->_gfxCursor32->unhide();
-	}
-
 	_isOpen = false;
 	_isInitialized = false;
 	_ignorePalettes = false;





More information about the Scummvm-git-logs mailing list