diff options
author | David Athay <dathay@mini1.local> | 2011-04-06 19:24:23 -0500 |
---|---|---|
committer | David Athay <dathay@mini1.local> | 2011-04-06 19:24:23 -0500 |
commit | 701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01 (patch) | |
tree | 4f01225b6a3958ce9361fe60533a19d6d522ed48 /src/client.cpp | |
parent | 66bd56ebec2bff48fb1484603b41643fd89bf4d6 (diff) | |
parent | b6f3db30c595d8e89572c78eb82b9823b8491c54 (diff) | |
download | mana-client-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.tar.gz mana-client-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.tar.bz2 mana-client-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.tar.xz mana-client-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.zip |
Merge branch '0.5' of git://gitorious.org/mana/mana into 0.5
Diffstat (limited to 'src/client.cpp')
-rw-r--r-- | src/client.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/client.cpp b/src/client.cpp index 42a8465b..d88c32c9 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1106,18 +1106,19 @@ void Client::initHomeDir() mConfigDir = mOptions.configDir; - if (mConfigDir.empty()){ + if (mConfigDir.empty()) + { + const std::string app = branding.getValue("appShort", "manasource"); #ifdef __APPLE__ - mConfigDir = mLocalDataDir + "/" + branding.getValue("appShort", "mana"); + mConfigDir = mLocalDataDir + "/" + app; #elif defined WIN32 mConfigDir = getSpecialFolderLocation(CSIDL_APPDATA); if (mConfigDir.empty()) mConfigDir = mLocalDataDir; else - mConfigDir += "/mana/" + branding.getValue("appShort", "Mana"); + mConfigDir += "/mana/" + app; #else - mConfigDir = std::string(PHYSFS_getUserDir()) + - "/.config/mana/" + branding.getValue("appShort", "mana"); + mConfigDir = std::string(PHYSFS_getUserDir()) + "/.config/mana/" + app; #endif } |