Merge branch 'master' into titanic

2 files changed, 3 insertions, 1 deletions

diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp
index eb0f0390dc..62a897a332 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);
diff --git a/engines/sword25/fmv/movieplayer.h b/engines/sword25/fmv/movieplayer.h
index 95fb05ee60..b59b223b4c 100644
--- a/engines/sword25/fmv/movieplayer.h
+++ b/engines/sword25/fmv/movieplayer.h
@@ -67,7 +67,7 @@ public:
 	 * movie file, it will be unloaded and, if necessary, stopped playing.
 	 * @param Filename      The filename of the movie file to be loaded
 	 * @param Z             Z indicates the position of the film on the main graphics layer
-	 * @return              Returns false if an error occured while loading, otherwise true.
+	 * @return              Returns false if an error occurred while loading, otherwise true.
 	*/
 	bool loadMovie(const Common::String &filename, uint z);