Make ConfigurationManager::getUserConfigPath to return the actual config path where the settings, logs, and Lua storage are stored.

3 years ago · 5ff2fc55ac
parent a453e5c198
commit 5ff2fc55ac
2 changed files with 5 additions and 2 deletions
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@ -314,7 +314,10 @@ const boost::filesystem::path& ConfigurationManager::getGlobalPath() const

 const boost::filesystem::path& ConfigurationManager::getUserConfigPath() const
 {
-    return mFixedPath.getUserConfigPath();
+    if (mActiveConfigPaths.empty())
+        return mFixedPath.getUserConfigPath();
+    else
+        return mActiveConfigPaths.back();
 }

 const boost::filesystem::path& ConfigurationManager::getUserDataPath() const
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@ -32,10 +32,10 @@ struct ConfigurationManager

    /**< Fixed paths */
    const boost::filesystem::path& getGlobalPath() const;
-    const boost::filesystem::path& getUserConfigPath() const;
    const boost::filesystem::path& getLocalPath() const;

    const boost::filesystem::path& getGlobalDataPath() const;
+    const boost::filesystem::path& getUserConfigPath() const;
    const boost::filesystem::path& getUserDataPath() const;
    const boost::filesystem::path& getLocalDataPath() const;
    const boost::filesystem::path& getInstallPath() const;