From b7469085b596e3d2fc330fe23ec60c76116c2ed7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 12 Nov 2016 08:12:49 -0500
Subject: TITANIC: Fix not being able to leave chicken dispensor

---
 engines/titanic/support/avi_surface.cpp | 2 +-
 engines/titanic/support/movie.cpp       | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'engines/titanic/support')

diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 525c6513dd..361982339d 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -175,7 +175,7 @@ bool AVISurface::handleEvents(CMovieEventList &events) {
 			delete info;
 
 			if (_movieRangeInfo.empty()) {
-				// NO more ranges, so stop playback
+				// No more ranges, so stop playback
 				stop();
 			} else {
 				// Not empty, so move onto new first one
diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp
index 949ed62fca..1bdcdee6da 100644
--- a/engines/titanic/support/movie.cpp
+++ b/engines/titanic/support/movie.cpp
@@ -164,17 +164,15 @@ bool OSMovie::handleEvents(CMovieEventList &events) {
 
 	if (!_aviSurface.isPlaying())
 		return false;
-	if (!_aviSurface.isNextFrame())
-		return _aviSurface.isPlaying();
 
 	// Handle updating the frame
 	while (_aviSurface.isPlaying() && _aviSurface.isNextFrame()) {
 		_aviSurface.handleEvents(events);
 		_videoSurface->setTransparencySurface(_aviSurface.getSecondarySurface());
-	}
 
-	// Flag there's a video frame
-	_hasVideoFrame = true;
+		// Flag there's a video frame
+		_hasVideoFrame = true;
+	}
 
 	return _aviSurface.isPlaying();
 }
-- 
cgit v1.2.3