Subtitle language test updates.

[dcpomatic.git] / src / lib / reel_writer.cc

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 16b34d7856cf1e54023ef56faa537fb88c04e47a..3c516f54c1c753335b09d14e7af9d4bf55561028 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -608,7 +608,9 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
                        );
                if (a) {
                        a->set_annotation_text (i->first.name);
-                       a->set_language (dcp::LanguageTag(i->first.language));
+                       if (!i->first.language.empty()) {
+                               a->set_language (dcp::LanguageTag(i->first.language));
+                       }
                }
        }
 
@@ -697,7 +699,7 @@ ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track,
                        s->set_movie_title (_film->name ());
                        if (type == TEXT_OPEN_SUBTITLE) {
                                s->set_language (lang.empty() ? "Unknown" : lang.front().to_string());
-                       } else {
+                       } else if (!track->language.empty()) {
                                s->set_language (track->language);
                        }
                        s->set_reel_number (raw_convert<string> (_reel_index + 1));