summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/lib/subtitle_decoder.cc1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e001b4e6..2813785bf 100644
--- 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 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> image, dcpomatic::Rect<double> rect)
{
ImageStart (ContentImageSubtitle (from, image, rect));
+ _position = from;
}
void