Merge with develop

--HG--
branch : compatibility-develop
hg/compatibility-develop
kervala 9 years ago
commit 7c37cce41e

@ -221,7 +221,7 @@ void CPatchManager::setClientRootPath(const std::string& clientRootPath)
ReadableClientDataPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/data"); ReadableClientDataPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/data");
#elif defined(NL_OS_UNIX) #elif defined(NL_OS_UNIX)
ReadableClientDataPath = CPath::standardizePath(getRyzomSharePrefix() + "/data"); ReadableClientDataPath = CPath::standardizePath(getRyzomSharePrefix() + "/data");
if (CFile::isDirectory(ReadableClientDataPath)) ReadableClientDataPath.clear() if (CFile::isDirectory(ReadableClientDataPath)) ReadableClientDataPath.clear();
#else #else
ReadableClientDataPath.clear(); ReadableClientDataPath.clear();
#endif #endif

Loading…
Cancel
Save