summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFedja Beader <fedja@protonmail.ch>2024-05-08 22:27:08 +0000
committerFedja Beader <fedja@protonmail.ch>2024-05-08 22:27:08 +0000
commit4552a373ebffe0e7ab163fe0f82b0f260d573d81 (patch)
tree49115ef234dc98e13205cd5b1ecffb1bf957e514
parent52b591d71bbb4aec2b212b4d8190e6db18a46c73 (diff)
downloadplus-4552a373ebffe0e7ab163fe0f82b0f260d573d81.tar.gz
plus-4552a373ebffe0e7ab163fe0f82b0f260d573d81.tar.bz2
plus-4552a373ebffe0e7ab163fe0f82b0f260d573d81.tar.xz
plus-4552a373ebffe0e7ab163fe0f82b0f260d573d81.zip
Don't use pathJoin for URLs
Problem happens only on Windows that uses \ for path separators and only when primary download location does not contain requested file with requested checksum. To repro, it should be enough to change one checksum in resources.xml Report from Manatauro: ![pathjoin](/uploads/4b969168ba7babc21108c1db1a680f66/pathjoin.jpg) **** mana/plus!82
-rw-r--r--src/gui/windows/updaterwindow.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 948ce5a17..2ed01f4f3 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -619,8 +619,7 @@ void UpdaterWindow::download()
const STD_VECTOR<std::string> &mirrors = settings.updateMirrors;
FOR_EACH (STD_VECTOR<std::string>::const_iterator, it, mirrors)
{
- mDownload->addMirror(pathJoin(*it,
- mCurrentFile));
+ mDownload->addMirror(urlJoin(*it, mCurrentFile));
}
}
}