From: Carl Hetherington <cth@carlh.net>
Date: Sun, 15 Jan 2023 22:35:43 +0000 (+0100)
Subject: Write dummy subtitles also to empty Interop reels (#2421).
X-Git-Tag: v2.16.41~37
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=a8c53b9b792a8740cbf856d784e7643623c4359c

Write dummy subtitles also to empty Interop reels (#2421).
---

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 94b12ec7d..e0279725b 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -856,36 +856,37 @@ ReelWriter::empty_text_asset (TextType type, optional<DCPTextTrack> track, bool
 		if (film()->encrypted()) {
 			s->set_key (film()->key());
 		}
-		if (with_dummy) {
-			s->add (
-				std::make_shared<dcp::SubtitleString>(
-					optional<std::string>(),
-					false,
-					false,
-					false,
-					dcp::Colour(),
-					42,
-					1.0,
-					dcp::Time(0, 0, 0, 0, 24),
-					dcp::Time(0, 0, 1, 0, 24),
-					0.5,
-					dcp::HAlign::CENTER,
-					0.5,
-					dcp::VAlign::CENTER,
-					0,
-					dcp::Direction::LTR,
-					" ",
-					dcp::Effect::NONE,
-					dcp::Colour(),
-					dcp::Time(),
-					dcp::Time(),
-					0
-					)
-			       );
-		}
 		asset = s;
 	}
 
+	if (with_dummy) {
+		asset->add(
+			std::make_shared<dcp::SubtitleString>(
+				optional<std::string>(),
+				false,
+				false,
+				false,
+				dcp::Colour(),
+				42,
+				1.0,
+				dcp::Time(0, 0, 0, 0, 24),
+				dcp::Time(0, 0, 1, 0, 24),
+				0.5,
+				dcp::HAlign::CENTER,
+				0.5,
+				dcp::VAlign::CENTER,
+				0,
+				dcp::Direction::LTR,
+				" ",
+				dcp::Effect::NONE,
+				dcp::Colour(),
+				dcp::Time(),
+				dcp::Time(),
+				0
+				)
+		       );
+	}
+
 	return asset;
 }