summaryrefslogtreecommitdiff
path: root/src/client.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-04-02 06:23:19 +0300
committerAndrei Karas <akaras@inbox.ru>2017-04-03 18:44:58 +0300
commit49631972db5b965413d4bbe36983a8d5bd203183 (patch)
treecb31545521cb4b33e65f8e94e7f2d5cd33e9e7a1 /src/client.cpp
parentbe7786e70668c014b19263895a6c8f507ed8161d (diff)
downloadmv-49631972db5b965413d4bbe36983a8d5bd203183.tar.gz
mv-49631972db5b965413d4bbe36983a8d5bd203183.tar.bz2
mv-49631972db5b965413d4bbe36983a8d5bd203183.tar.xz
mv-49631972db5b965413d4bbe36983a8d5bd203183.zip
Use pathJoin for concatinate some paths.
Diffstat (limited to 'src/client.cpp')
-rw-r--r--src/client.cpp37
1 files changed, 19 insertions, 18 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 6715290ff..d15aa240a 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -298,9 +298,14 @@ void Client::gameInit()
// Configure logger
if (!settings.options.logFileName.empty())
+ {
settings.logFileName = settings.options.logFileName;
+ }
else
- settings.logFileName = settings.localDataDir + "/manaplus.log";
+ {
+ settings.logFileName = pathJoin(settings.localDataDir,
+ "manaplus.log");
+ }
logger->log("Log file: " + settings.logFileName);
logger->setLogFile(settings.logFileName);
@@ -1092,15 +1097,13 @@ int Client::gameExec()
if (!settings.options.skipUpdate)
{
VirtFs::searchAndRemoveArchives(
- settings.updatesDir +
- "/local/",
+ pathJoin(settings.updatesDir, "local/"),
"zip");
- VirtFs::unmountDirSilent(
- settings.localDataDir +
- dirSeparator +
- settings.updatesDir +
- "/local/");
+ VirtFs::unmountDirSilent(pathJoin(
+ settings.localDataDir,
+ settings.updatesDir,
+ "local/"));
}
resourceManager->clearCache();
@@ -1277,16 +1280,15 @@ int Client::gameExec()
}
else if (loginData.updateType & UpdateType::Skip)
{
- settings.oldUpdates = settings.localDataDir
- + dirSeparator + settings.updatesDir;
+ settings.oldUpdates = pathJoin(settings.localDataDir,
+ settings.updatesDir);
UpdaterWindow::loadLocalUpdates(settings.oldUpdates);
mState = State::LOAD_DATA;
}
else
{
- settings.oldUpdates = settings.localDataDir +
- dirSeparator +
- settings.updatesDir;
+ settings.oldUpdates = pathJoin(settings.localDataDir,
+ settings.updatesDir);
CREATEWIDGETV(mCurrentDialog, UpdaterWindow,
settings.updateHost,
settings.oldUpdates,
@@ -1319,11 +1321,10 @@ int Client::gameExec()
"zip",
Append_false);
- VirtFs::mountDir(
- settings.localDataDir +
- dirSeparator +
- settings.updatesDir +
- "/local/",
+ VirtFs::mountDir(pathJoin(
+ settings.localDataDir,
+ settings.updatesDir,
+ "local/"),
Append_false);
}