Fix crash on make-dcp after trimming end of text subtitles (#1275).

1 files changed, 8 insertions, 0 deletions

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 212bcfe45..6fcf57949 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -876,6 +876,10 @@ Player::text_subtitle_start (weak_ptr<Piece> wp, ContentTextSubtitle subtitle)
 	PlayerSubtitles ps;
 	DCPTime const from (content_time_to_dcp (piece, subtitle.from()));
 
+	if (from > piece->content->end()) {
+		return;
+	}
+
 	BOOST_FOREACH (dcp::SubtitleString s, subtitle.subs) {
 		s.set_h_position (s.h_position() + piece->content->subtitle->x_offset ());
 		s.set_v_position (s.v_position() + piece->content->subtitle->y_offset ());
@@ -918,6 +922,10 @@ Player::subtitle_stop (weak_ptr<Piece> wp, ContentTime to)
 
 	DCPTime const dcp_to = content_time_to_dcp (piece, to);
 
+	if (dcp_to > piece->content->end()) {
+		return;
+	}
+
 	pair<PlayerSubtitles, DCPTime> from = _active_subtitles.add_to (wp, dcp_to);
 
 	if (piece->content->subtitle->use() && !_always_burn_subtitles && !piece->content->subtitle->burn()) {