From: Carl Hetherington <cth@carlh.net>
Date: Sun, 16 Feb 2020 19:39:47 +0000 (+0100)
Subject: Just having no specified lines value does not mean we definitely need place the subti... 
X-Git-Tag: v2.15.43~13
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=d1172ffb60ec687ae4ca186cbac0e2add0754789

Just having no specified lines value does not mean we definitely need place the subtitle ourselves.
---

diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index 313fbaa5c..28dace7af 100644
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -106,9 +106,8 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
 	bool needs_placement = false;
 	optional<int> bottom_line;
 	BOOST_FOREACH (sub::Line i, subtitle.lines) {
-		if (!i.vertical_position.reference || !i.vertical_position.lines || i.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE) {
+		if (!i.vertical_position.reference || (i.vertical_position.line && !i.vertical_position.lines) || i.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE) {
 			needs_placement = true;
-			DCPOMATIC_ASSERT (i.vertical_position.line);
 			if (!bottom_line || bottom_line.get() < i.vertical_position.line.get()) {
 				bottom_line = i.vertical_position.line.get();
 			}