diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-05-09 00:48:07 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-05-29 11:49:34 +0200 |
| commit | 4021e2a5b467338814664c466a84714da5fcbc0b (patch) | |
| tree | 7902f5300ffc2673fd6ba5d30e9c402a1ea347a9 /src/lib/config.cc | |
| parent | 6cc78916f19b813cef89ef7028b7c4de6bb94c1f (diff) | |
Interpret relative cinemas SQLite3 paths as being relative to the config.xml (#3038).
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 669ea4e21..66a0e1a5a 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -1736,6 +1736,17 @@ Config::cinemas_file_from_zip(boost::filesystem::path zip) } +boost::filesystem::path +Config::cinemas_file() const +{ + if (_cinemas_file.is_absolute()) { + return _cinemas_file; + } + + return read_path("config.xml").parent_path() / _cinemas_file; +} + + #ifdef DCPOMATIC_GROK Config::Grok::Grok() |
