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/dyetool/client.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/dyetool')

diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp
index 8be7b125e..f618db321 100644
--- a/src/dyetool/client.cpp
+++ b/src/dyetool/client.cpp
@@ -159,9 +159,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->setLogFile(settings.logFileName);
 
 #ifdef USE_FUZZER
@@ -640,14 +645,15 @@ int Client::gameExec()
 
                     if (!settings.options.skipUpdate)
                     {
-                        VirtFs::searchAndAddArchives(
-                            settings.updatesDir + "/local/",
+                        VirtFs::searchAndAddArchives(pathJoin(
+                            settings.updatesDir, "local/"),
                             "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