From f833cc43de0c561918f8bf21237a106aaa80f4b2 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 7 Dec 2015 19:37:50 +0100 Subject: [PATCH] Changed: Replace RYZOM_SHARE_PREFIX by getRyzomSharePrefix() --HG-- branch : develop --- code/ryzom/client/src/login_patch.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index 6dd7195e2..906e2a367 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -62,6 +62,7 @@ #include "login_patch.h" #include "login.h" +#include "user_agent.h" #ifndef RY_BG_DOWNLOADER @@ -218,8 +219,15 @@ void CPatchManager::setClientRootPath(const std::string& clientRootPath) #ifdef NL_OS_MAC ReadableClientDataPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/data"); -#elif defined(NL_OS_UNIX) && defined(RYZOM_SHARE_PREFIX) - ReadableClientDataPath = CPath::standardizePath(std::string(RYZOM_SHARE_PREFIX) + "/data"); +#elif defined(NL_OS_UNIX) + if (!getRyzomSharePrefix().empty()) + { + ReadableClientDataPath = CPath::standardizePath(getRyzomSharePrefix() + "/data"); + } + else + { + ReadableClientDataPath = WritableClientDataPath; + } #else ReadableClientDataPath = WritableClientDataPath; #endif