From a9cb7313f7846f8b2bf9f96d19cf28abd7caf7fc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 16 Sep 2024 10:10:46 +0200 Subject: Fix thinko in relative path change. We have to canonicalise relative paths with respect to the film's directory on load, otherwise we try to use the relative path and it's interpreted against the current working directory. This unfortunately requires the film's directory to be piped into quite a lot of new places. --- src/lib/string_text_file_content.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/string_text_file_content.cc') diff --git a/src/lib/string_text_file_content.cc b/src/lib/string_text_file_content.cc index 6ae9fc627..4f7fbb241 100644 --- a/src/lib/string_text_file_content.cc +++ b/src/lib/string_text_file_content.cc @@ -52,8 +52,8 @@ StringTextFileContent::StringTextFileContent (boost::filesystem::path path) } -StringTextFileContent::StringTextFileContent (cxml::ConstNodePtr node, int version, list& notes) - : Content (node) +StringTextFileContent::StringTextFileContent(cxml::ConstNodePtr node, boost::optional film_directory, int version, list& notes) + : Content (node, film_directory) , _length (node->number_child("Length")) { text = TextContent::from_xml (this, node, version, notes); -- cgit v1.2.3