[Scummvm-cvs-logs] scummvm branch-1-8 -> b7854c3f9f352d7e2c14fb762e3662197acb5aac

[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:
b7854c3f9f SWORD25: Fix frozen/flickering title menu movie


Commit: b7854c3f9f352d7e2c14fb762e3662197acb5aac
    https://github.com/scummvm/scummvm/commit/b7854c3f9f352d7e2c14fb762e3662197acb5aac
Author: ottogin (lukartoil at mail.ru)
Date: 2016-03-15T11:28:45+01:00

Commit Message:
SWORD25: Fix frozen/flickering title menu movie
Fixes bug #6978: Unload old movie before loading a new one

Changed paths:
    engines/sword25/fmv/movieplayer.cpp



diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp
index eb0f039..62a897a3 100644
--- a/engines/sword25/fmv/movieplayer.cpp
+++ b/engines/sword25/fmv/movieplayer.cpp
@@ -58,6 +58,8 @@ MoviePlayer::~MoviePlayer() {
 }
 
 bool MoviePlayer::loadMovie(const Common::String &filename, uint z) {
+	if (isMovieLoaded())
+		unloadMovie();
 	// Get the file and load it into the decoder
 	Common::SeekableReadStream *in = Kernel::getInstance()->getPackage()->getStream(filename);
 	_decoder.loadStream(in);