From 655a1133beca1160951cbc09bfaeb44752b9de41 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 4 Dec 2024 23:11:17 +0100 Subject: Don't give an alarming error when there is no assets.xml. --- src/lib/film.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/lib/film.cc b/src/lib/film.cc index a4734d4c3..1258cdb11 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -2439,18 +2439,24 @@ Film::read_ui_state() vector Film::read_remembered_assets() const { + auto const filename = dcp::filesystem::fix_long_path(file(assets_file)); + + if (!boost::filesystem::exists(filename)) { + return {}; + } + vector assets; try { cxml::Document xml("Assets"); - xml.read_file(dcp::filesystem::fix_long_path(file(assets_file))); + xml.read_file(filename); for (auto node: xml.node_children("Asset")) { assets.push_back(RememberedAsset(node)); } } catch (std::exception& e) { - LOG_ERROR("Could not read assets file %1 (%2)", file(assets_file), e.what()); + LOG_ERROR("Could not read assets file %1 (%2)", filename, e.what()); } catch (...) { - LOG_ERROR("Could not read assets file %1", file(assets_file)); + LOG_ERROR("Could not read assets file %1", filename); } return assets; -- cgit v1.2.3