diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-08-03 11:43:34 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-08-03 11:43:34 -0600 |
| commit | 94f91a5fd9f3f609e93224fe71d2a3bcce1c0866 (patch) | |
| tree | 3541e3e91bca871cfa5e4cf395d35957d8f7c5cf /src/client.cpp | |
| parent | 71ea8233334803a079ad24396ead02280a80d8d4 (diff) | |
| parent | 98abc793f8fb45d647e1e8c51cf5f38170c6b703 (diff) | |
| download | mana-94f91a5fd9f3f609e93224fe71d2a3bcce1c0866.tar.gz mana-94f91a5fd9f3f609e93224fe71d2a3bcce1c0866.tar.bz2 mana-94f91a5fd9f3f609e93224fe71d2a3bcce1c0866.tar.xz mana-94f91a5fd9f3f609e93224fe71d2a3bcce1c0866.zip | |
Merge remote branch 'origin/1.0'
Conflicts:
src/net/tmwa/chathandler.cpp
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client.cpp b/src/client.cpp index 2ebdb247..23f7a76d 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1052,13 +1052,13 @@ void Client::initHomeDir() if (mConfigDir.empty()){ #ifdef __APPLE__ - mConfigDir = mLocalDataDir; + mConfigDir = mLocalDataDir + "/" + branding.getValue("appShort", "mana"); #elif defined WIN32 mConfigDir = getSpecialFolderLocation(CSIDL_APPDATA); if (mConfigDir.empty()) mConfigDir = mLocalDataDir; else - mConfigDir += "/mana/" + branding.getValue("appName", "Mana"); + mConfigDir += "/mana/" + branding.getValue("appShort", "Mana"); #else mConfigDir = std::string(PHYSFS_getUserDir()) + "/.config/mana/" + branding.getValue("appShort", "mana"); |