Don't try to set empty languages on CCAP tracks.

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

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 345bcdeb38d9c8832f4e2c4a59384c8f9d30f79b..16b34d7856cf1e54023ef56faa537fb88c04e47a 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -608,7 +608,7 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
                        );
                if (a) {
                        a->set_annotation_text (i->first.name);
-                       a->set_language (i->first.language);
+                       a->set_language (dcp::LanguageTag(i->first.language));
                }
        }
 
@@ -708,7 +708,7 @@ ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track,
                        s->set_metadata (mxf_metadata());
                        if (type == TEXT_OPEN_SUBTITLE && !lang.empty()) {
                                s->set_language (lang.front());
-                       } else {
+                       } else if (track && !track->language.empty()) {
                                s->set_language (dcp::LanguageTag(track->language));
                        }
                        s->set_edit_rate (dcp::Fraction (_film->video_frame_rate (), 1));