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

[dcpomatic.git] / src / lib / config.cc

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 2ae7939a9e7bcf7ad725c2ec6176d6f29ffce4cc..e2f2bbeb97a81fff2ccbf19ae50798916394cd89 100644 (file)
--- 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 ();