aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2016-10-26 20:56:20 -0400
committerPaul Gilbert2016-10-26 20:56:20 -0400
commit77bd2865cc8dba8d94c4e5153c9acb93d0db712d (patch)
treeaa0e7322fd9de3fd7a16864d739b0546d775aff3
parent74bb5c52070a7a5379324ce34145ac2ff2d6dd6f (diff)
downloadscummvm-rg350-77bd2865cc8dba8d94c4e5153c9acb93d0db712d.tar.gz
scummvm-rg350-77bd2865cc8dba8d94c4e5153c9acb93d0db712d.tar.bz2
scummvm-rg350-77bd2865cc8dba8d94c4e5153c9acb93d0db712d.zip
TITANIC: Fix hang when reaching very end of movies
-rw-r--r--engines/titanic/support/avi_surface.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/titanic/support/avi_surface.h b/engines/titanic/support/avi_surface.h
index b4e6d420cb..e4599da03a 100644
--- a/engines/titanic/support/avi_surface.h
+++ b/engines/titanic/support/avi_surface.h
@@ -132,7 +132,9 @@ public:
/**
* Return true if a video is currently playing
*/
- virtual bool isPlaying() const { return _decoder->isPlaying(); }
+ virtual bool isPlaying() const {
+ return _decoder->isPlaying() && !_decoder->endOfVideo();
+ }
/**
* Handle any movie events relevent for the frame