Missing setup of SubtitleDecoder position causing #1271 and probably other things.

diff --git a/ChangeLog b/ChangeLog
index 3e001b4e6d92dbace9d263821f52d08ad82ab201..2813785bfeb480744e88400be3c6afce9f46b870 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-10  Carl Hetherington  <cth@carlh.net>
+
+       * Fix disappearing subtitles when they are added from text files
+       alongside video content which also contain subtitles (#1271).
+
 2018-04-05  Carl Hetherington  <cth@carlh.net>
 
        * Fix crash on startup if there are no audio devices (#1265).

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 39c36415a189b3c996284d8e6ed7c18344e74694..32cae6accc0e40318ad495944bcb3ce2aedd6beb 100644 (file)
--- 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> image, dcpomatic::Rect<double> rect)
 {
        ImageStart (ContentImageSubtitle (from, image, rect));
+       _position = from;
 }
 
 void