Fix merge.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index ba899fe576a98b701d9043a432a9daa3acf320e1..79a7b01f1dd68f4aebf39cb07e5797533926abfa 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -221,7 +221,8 @@ Config::file (bool old) const
        if (old) {
                p /= ".dvdomatic";
        } else {
-               p /= "dcpomatic.xml";
+               p /= "dcpomatic";
+               p /= "config.xml";
        }
        return p;
 }
@@ -231,7 +232,7 @@ Config::signer_chain_directory () const
 {
        boost::filesystem::path p;
        p /= g_get_user_config_dir ();
-       p /= "dvdomatic";
+       p /= "dcpomatic";
        p /= "crypt";
        boost::filesystem::create_directories (p);
        return p;