From 41daefcf0f0fcabd03e084ab05ee35f823740234 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 30 Nov 2020 21:39:53 +0100 Subject: [PATCH] Fix loading very (very) old metadata files. --- src/lib/film.cc | 14 ++++++++------ 1 file 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 path) } } - optional 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 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 (...) { + } } } } -- 2.30.2