aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMislav Blažević <krofnica996@gmail.com>2013-01-22 09:36:54 +0100
committerMislav Blažević <krofnica996@gmail.com>2013-01-22 09:36:54 +0100
commit0cdadcdd781b768d9869f6b06e6abb572fbfdefc (patch)
treeaee6b0f96d341a0a6858bfbc6dbdd43270a2fe81
parent0b6997b8af2ebd377b418235c62161e93a64ec5c (diff)
Expand ~ to home directory on unix
-rw-r--r--src/server/game/World/World.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index d232920418d..264119ee99c 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1118,6 +1118,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)