Interpret relative cinemas SQLite3 paths as being relative to the config.xml (#3038).

2 files changed, 12 insertions, 3 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()
diff --git a/src/lib/config.h b/src/lib/config.h
index b2a979ffa..c90790ebc 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -396,9 +396,7 @@ public:
 		return _dkdms;
 	}
 
-	boost::filesystem::path cinemas_file() const {
-		return _cinemas_file;
-	}
+	boost::filesystem::path cinemas_file() const;
 
 	boost::filesystem::path dkdm_recipients_file() const {
 		return _dkdm_recipients_file;