From: Carl Hetherington <cth@carlh.net>
Date: Tue, 15 May 2018 21:37:26 +0000 (+0100)
Subject: Fix failure to skip through more than one empty reel when looking for a reel to put... 
X-Git-Tag: v2.13.21~1
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=e881184597fa77bcc4ebf1e64a48927bc210d03d;hp=011d403dc6ffbb3c0ddf0b23f6267735bdc1e751;p=dcpomatic.git

Fix failure to skip through more than one empty reel when looking for a reel to put subtitles in.
---

diff --git a/ChangeLog b/ChangeLog
index dcb0ef1cb..98f6c7d90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2018-05-15  Carl Hetherington  <cth@carlh.net>
 
+	* Fix incorrect subtitle positining in a VF when there are more than
+	two consecutive reels with no subtitles.
+
 	* Fix missing burnt-in / previewed subtitles containing ampersands.
 
 2018-05-08  Carl Hetherington  <cth@carlh.net>
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index d86a2ccf4..896d59cfc 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -660,8 +660,9 @@ Writer::write (PlayerSubtitles subs, DCPTimePeriod period)
 		return;
 	}
 
-	if (_subtitle_reel->period().to <= period.from) {
+	while (_subtitle_reel->period().to <= period.from) {
 		++_subtitle_reel;
+		DCPOMATIC_ASSERT (_subtitle_reel != _reels.end());
 	}
 
 	DCPOMATIC_ASSERT (_subtitle_reel != _reels.end());