[Scummvm-git-logs] scummvm master -> 77bd2865cc8dba8d94c4e5153c9acb93d0db712d
dreammaster
dreammaster at scummvm.org
Thu Oct 27 02:56:25 CEST 2016
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:
77bd2865cc TITANIC: Fix hang when reaching very end of movies
Commit: 77bd2865cc8dba8d94c4e5153c9acb93d0db712d
https://github.com/scummvm/scummvm/commit/77bd2865cc8dba8d94c4e5153c9acb93d0db712d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-26T20:56:20-04:00
Commit Message:
TITANIC: Fix hang when reaching very end of movies
Changed paths:
engines/titanic/support/avi_surface.h
diff --git a/engines/titanic/support/avi_surface.h b/engines/titanic/support/avi_surface.h
index b4e6d42..e4599da 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
More information about the Scummvm-git-logs
mailing list