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.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index d142c416f..ee49d50bc 100644
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -52,13 +52,10 @@ DCPOMATIC_ENABLE_WARNINGS
 
 using std::cerr;
 using std::cout;
-using std::function;
 using std::ifstream;
 using std::list;
 using std::make_pair;
 using std::pair;
-using std::runtime_error;
-using std::shared_ptr;
 using std::string;
 using std::vector;
 using std::wstring;
@@ -382,11 +379,14 @@ Drive::unmount ()
 
 
 boost::filesystem::path
-config_path ()
+config_path (optional<string> version)
 {
 	boost::filesystem::path p;
 	p /= g_get_user_config_dir ();
 	p /= "dcpomatic2";
+	if (version) {
+		p /= *version;
+	}
 	return p;
 }