summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-11-30 21:39:53 +0100
committerCarl Hetherington <cth@carlh.net>2020-11-30 21:39:53 +0100
commit41daefcf0f0fcabd03e084ab05ee35f823740234 (patch)
tree31611382b4da7ab9bff94aec96afe8a266a73b12
parent18fc1be983098c0b95bce8619bffce46179c7a51 (diff)
Fix loading very (very) old metadata files.
-rw-r--r--src/lib/film.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 4b82f1d8b..5b8acbae9 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -702,15 +702,17 @@ Film::read_metadata (optional<boost::filesystem::path> path)
}
}
- optional<string> isdcf_language = f.node_child("ISDCFMetadata")->optional_string_child("SubtitleLanguage");
- if (isdcf_language && !found_language) {
- try {
- found_language = dcp::LanguageTag(*isdcf_language);
- } catch (...) {
+ if (_state_version >= 9) {
+ optional<string> isdcf_language = f.node_child("ISDCFMetadata")->optional_string_child("SubtitleLanguage");
+ if (isdcf_language && !found_language) {
try {
- found_language = dcp::LanguageTag(boost::algorithm::to_lower_copy(*isdcf_language));
+ found_language = dcp::LanguageTag(*isdcf_language);
} catch (...) {
+ try {
+ found_language = dcp::LanguageTag(boost::algorithm::to_lower_copy(*isdcf_language));
+ } catch (...) {
+ }
}
}
}