From cc39c4f57fc48c581a25dc4c37f26adf95278914 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 31 May 2023 20:13:50 +0200
Subject: Fix missing subtitle language in CPL on auto-created empty subtitle
 assets (#2548).

---
 src/lib/reel_writer.cc | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 658de0a62..aae2a6273 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -655,12 +655,7 @@ ReelWriter::create_reel_text (
 		_subtitle_asset, duration, reel, _reel_index, _reel_count, _content_summary, refs, film(), _period, output_dcp, _text_only
 		);
 
-	if (subtitle) {
-		/* We have a subtitle asset that we either made or are referencing */
-		if (auto main_language = film()->subtitle_languages().first) {
-			subtitle->set_language (*main_language);
-		}
-	} else if (ensure_subtitles) {
+	if (!subtitle && ensure_subtitles) {
 		/* We had no subtitle asset, but we've been asked to make sure there is one */
 		subtitle = maybe_add_text<dcp::ReelInteropSubtitleAsset, dcp::ReelSMPTESubtitleAsset, dcp::ReelSubtitleAsset> (
 			empty_text_asset(TextType::OPEN_SUBTITLE, optional<DCPTextTrack>(), true),
@@ -677,6 +672,13 @@ ReelWriter::create_reel_text (
 			);
 	}
 
+	if (subtitle) {
+		/* We have a subtitle asset that we either made or are referencing */
+		if (auto main_language = film()->subtitle_languages().first) {
+			subtitle->set_language (*main_language);
+		}
+	}
+
 	for (auto const& i: _closed_caption_assets) {
 		auto a = maybe_add_text<dcp::ReelInteropClosedCaptionAsset, dcp::ReelSMPTEClosedCaptionAsset, dcp::ReelClosedCaptionAsset> (
 			i.second, duration, reel, _reel_index, _reel_count, _content_summary, refs, film(), _period, output_dcp, _text_only
-- 
cgit v1.2.3