summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-04 17:43:11 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-04 17:43:40 +0300
commit2ac4af7560ae6596f442600843acc9fe9cfe7964 (patch)
tree83e2fdb70d23b207104d42bab6d6cb29d002dd86 /src/gui/windows
parent787caddc0074df0b3fb217bad561be8fd71ca5b9 (diff)
downloadmanaverse-2ac4af7560ae6596f442600843acc9fe9cfe7964.tar.gz
manaverse-2ac4af7560ae6596f442600843acc9fe9cfe7964.tar.bz2
manaverse-2ac4af7560ae6596f442600843acc9fe9cfe7964.tar.xz
manaverse-2ac4af7560ae6596f442600843acc9fe9cfe7964.zip
Improve join some paths.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/updaterwindow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 13e16627d..823a92c3d 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -603,7 +603,7 @@ void UpdaterWindow::download()
if (mDownloadStatus == UpdateDownloadStatus::UPDATE_LIST2 ||
mDownloadStatus == UpdateDownloadStatus::UPDATE_RESOURCES2)
{
- const std::string str = mUpdateServerPath + "/" + mCurrentFile;
+ const std::string str = urlJoin(mUpdateServerPath, mCurrentFile);
mDownload->addMirror(updateServer3 + str);
mDownload->addMirror(updateServer4 + str);
mDownload->addMirror(updateServer5 + str);
@@ -1176,7 +1176,7 @@ void UpdaterWindow::loadDirMods(const std::string &dir)
const std::string &localDir = mod->getLocalDir();
if (!localDir.empty())
{
- VirtFs::mountDir(dir + "/" + localDir,
+ VirtFs::mountDir(pathJoin(dir, localDir),
Append_false);
}
}
@@ -1200,7 +1200,7 @@ void UpdaterWindow::unloadMods(const std::string &dir)
{
const std::string &localDir = mod->getLocalDir();
if (!localDir.empty())
- VirtFs::unmountDir(dir + "/" + localDir);
+ VirtFs::unmountDir(pathJoin(dir, localDir));
}
}
}