Fix subtitle display when the next subtitle is decoded before the

previous one has finished; this requires that more than one subtitle be
kept by the player.

Reported-by: Matthias Damm

1 files changed, 10 insertions, 0 deletions

diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc
index f348833b0..0d18861c4 100644
--- a/src/lib/subtitle.cc
+++ b/src/lib/subtitle.cc
@@ -97,6 +97,8 @@ Subtitle::update (shared_ptr<const Film> film, libdcp::Size video_container_size
 	
 	_out_from = from + piece->content->position ();
 	_out_to = to + piece->content->position ();
+
+	check_out_to ();
 }
 
 bool
@@ -104,3 +106,11 @@ Subtitle::covers (Time t) const
 {
 	return _out_from <= t && t <= _out_to;
 }
+
+void
+Subtitle::check_out_to ()
+{
+	if (_stop && _out_to > _stop.get ()) {
+		_out_to = _stop.get ();
+	}
+}