X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.cc;h=32cae6accc0e40318ad495944bcb3ce2aedd6beb;hb=31f9d8691ec467c7b7d977f1950dfbfa98ba73ac;hp=9351d6865be55d50a02f0dc533aca5f241393cd6;hpb=9b1c6dd87c2a1b0b480a23da756d22c3bfedd9f1;p=dcpomatic.git

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 9351d6865..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
@@ -85,8 +86,12 @@ SubtitleDecoder::emit_text_start (ContentTime from, list<dcp::SubtitleString> s)
 		if (content()->effect()) {
 			i.set_effect (*content()->effect());
 		}
-		i.set_fade_up_time (dcp::Time(content()->fade_in().seconds(), 1000));
-		i.set_fade_down_time (dcp::Time(content()->fade_out().seconds(), 1000));
+		if (content()->fade_in()) {
+			i.set_fade_up_time (dcp::Time(content()->fade_in()->seconds(), 1000));
+		}
+		if (content()->fade_out()) {
+			i.set_fade_down_time (dcp::Time(content()->fade_out()->seconds(), 1000));
+		}
 	}
 
 	TextStart (ContentTextSubtitle (from, s));