Merge.

[dcpomatic.git] / src / lib / subtitle.cc

diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc
index f348833b0de52ad6615090660963df2015ff12c4..0d18861c455f69f2d2649730f93d898d0ed66463 100644 (file)
--- 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 ();
+       }
+}