X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fstate.cc;fp=src%2Flib%2Fstate.cc;h=dd48516f43fc05a384089c543a8b60a12896ea5f;hb=a1f7bf2d9e5610075fbd898cdf52f4f8373741f2;hp=abb1976951e9f5b62daccb8e7fe2674da17b45d1;hpb=adddda49c17e87198253d9c900dcef0f5fb2e175;p=dcpomatic.git diff --git a/src/lib/state.cc b/src/lib/state.cc index abb197695..dd48516f4 100644 --- a/src/lib/state.cc +++ b/src/lib/state.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2018 Carl Hetherington + Copyright (C) 2018-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -19,6 +19,7 @@ */ #include "state.h" +#include "cross.h" #include using std::string; @@ -34,16 +35,7 @@ State::path (string file, bool create_directories) if (override_path) { p = *override_path; } else { -#ifdef DCPOMATIC_OSX - p /= g_get_home_dir (); - p /= "Library"; - p /= "Preferences"; - p /= "com.dcpomatic"; - p /= "2"; -#else - p /= g_get_user_config_dir (); - p /= "dcpomatic2"; -#endif + p = config_path (); } boost::system::error_code ec; if (create_directories) {