diff options
| author | click <clickvd@gonnamakeyou.com> | 2013-01-22 12:59:18 -0800 |
|---|---|---|
| committer | click <clickvd@gonnamakeyou.com> | 2013-01-22 12:59:18 -0800 |
| commit | 907cd173427bc6e0b498f99363026191dabac34d (patch) | |
| tree | 8a789ae0908dd7caf3d8c51a3e21db51187c9e8e /src | |
| parent | 4f3c6b139031116fe5074e9340bc53139a98ab57 (diff) | |
| parent | 0cdadcdd781b768d9869f6b06e6abb572fbfdefc (diff) | |
Merge pull request #9020 from krofna/krafixes
Core/ConfigReader: Expand ~ as the HOME envvar on UNIX-based platforms (requries that the HOME envvar has been set, it normally is)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/World/World.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 8f42be71f44..67444475849 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1121,6 +1121,15 @@ void World::LoadConfigSettings(bool reload) if (dataPath.at(dataPath.length()-1) != '/' && dataPath.at(dataPath.length()-1) != '\\') dataPath.push_back('/'); +#if PLATFORM == PLATFORM_UNIX || PLATFORM == PLATFORM_APPLE + if (dataPath[0] == '~') + { + const char* home = getenv("HOME"); + if (home) + dataPath.replace(0, 1, home); + } +#endif + if (reload) { if (dataPath != m_dataPath) |