From 31f9d8691ec467c7b7d977f1950dfbfa98ba73ac Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 10 Apr 2018 23:40:09 +0100 Subject: [PATCH] Missing setup of SubtitleDecoder position causing #1271 and probably other things. --- ChangeLog | 5 +++++ src/lib/subtitle_decoder.cc | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index d30e12b6f..4a6285ba0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-04-10 Carl Hetherington + + * Fix disappearing subtitles when they are added from text files + alongside video content which also contain subtitles (#1271). + 2018-04-06 Carl Hetherington * Fix missing start icon for the player in Linux. diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index 39c36415a..32cae6acc 100644 --- a/src/lib/subtitle_decoder.cc +++ b/src/lib/subtitle_decoder.cc @@ -61,6 +61,7 @@ void SubtitleDecoder::emit_image_start (ContentTime from, shared_ptr image, dcpomatic::Rect rect) { ImageStart (ContentImageSubtitle (from, image, rect)); + _position = from; } void -- 2.30.2