Allow command-line configuration of config location (#1284).

2 files changed, 6 insertions, 5 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 2ae7939a9..e2f2bbeb9 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -68,7 +68,7 @@ int const Config::_current_version = 3;
 boost::signals2::signal<void ()> Config::FailedToLoad;
 boost::signals2::signal<void (string)> Config::Warning;
 boost::signals2::signal<bool (void)> Config::BadSignerChain;
-boost::optional<boost::filesystem::path> Config::test_path;
+boost::optional<boost::filesystem::path> Config::override_path;
 
 /** Construct default configuration */
 Config::Config ()
@@ -456,8 +456,8 @@ boost::filesystem::path
 Config::path (string file, bool create_directories)
 {
 	boost::filesystem::path p;
-	if (test_path) {
-		p = test_path.get();
+	if (override_path) {
+		p = *override_path;
 	} else {
 #ifdef DCPOMATIC_OSX
 		p /= g_get_home_dir ();
diff --git a/src/lib/config.h b/src/lib/config.h
index 2fca9699c..c625e9242 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -721,8 +721,9 @@ public:
 	static bool have_existing (std::string);
 	static boost::filesystem::path config_file ();
 
-	static boost::optional<boost::filesystem::path> test_path;
-
+	/** If set, this overrides the standard path (in home, Library, AppData or wherever) for config.xml and cinemas.xml */
+	static boost::optional<boost::filesystem::path> override_path;
+	
 private:
 	Config ();
 	static boost::filesystem::path path (std::string file, bool create_directories = true);