From 49631972db5b965413d4bbe36983a8d5bd203183 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 2 Apr 2017 06:23:19 +0300
Subject: Use pathJoin for concatinate some paths.

---
 src/client.cpp | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'src/client.cpp')

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);
                     }
 
-- 
cgit v1.2.3-60-g2f50