diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-09-27 11:55:27 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-09-27 11:55:27 +0200 |
| commit | 6e3e984162ca7a181bc7c98d90c295e88e4e7f6c (patch) | |
| tree | f514e6618e9012c307188a11a9d2a2ade2e04d19 /src/lib/cross_osx.cc | |
| parent | a3d4dfb4357a265d4c3a4bfafe7d17a8ecc72f66 (diff) | |
| parent | 0771af91ad52ed2e25ab89410eb6e783b50f7329 (diff) | |
Merge branch 'own-config' into v2.15.x
This makes 2.15.x copy the 2.14.x configuration so you can run 2.14.x
again afterwards without recreating everything.
Diffstat (limited to 'src/lib/cross_osx.cc')
| -rw-r--r-- | src/lib/cross_osx.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc index d0cb9f216..ff40ffb70 100644 --- a/src/lib/cross_osx.cc +++ b/src/lib/cross_osx.cc @@ -552,7 +552,7 @@ Drive::get () boost::filesystem::path -config_path () +config_path (optional<string> version) { boost::filesystem::path p; p /= g_get_home_dir (); @@ -560,6 +560,9 @@ config_path () p /= "Preferences"; p /= "com.dcpomatic"; p /= "2"; + if (version) { + p /= *version; + } return p; } |