summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2020-10-13 22:01:01 +0200
committerPetr Mrázek <peterix@gmail.com>2020-10-13 22:01:01 +0200
commit4689571c24161c504d36de5afc9eacf1fd0fe3ac (patch)
tree07842517530fff83dbc1c02fa6b0cb69b3dc987a
parent4c62776044f3a7ad9efa3150ebec6150070502ed (diff)
downloadMultiMC-4689571c24161c504d36de5afc9eacf1fd0fe3ac.tar
MultiMC-4689571c24161c504d36de5afc9eacf1fd0fe3ac.tar.gz
MultiMC-4689571c24161c504d36de5afc9eacf1fd0fe3ac.tar.lz
MultiMC-4689571c24161c504d36de5afc9eacf1fd0fe3ac.tar.xz
MultiMC-4689571c24161c504d36de5afc9eacf1fd0fe3ac.zip
NOISSUE fix build: QTemporaryDir::filePath was added in Qt 5.9
-rw-r--r--api/logic/modplatform/technic/SolderPackInstallTask.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/api/logic/modplatform/technic/SolderPackInstallTask.cpp b/api/logic/modplatform/technic/SolderPackInstallTask.cpp
index cb440e84..1919c39e 100644
--- a/api/logic/modplatform/technic/SolderPackInstallTask.cpp
+++ b/api/logic/modplatform/technic/SolderPackInstallTask.cpp
@@ -92,7 +92,8 @@ void Technic::SolderPackInstallTask::fileListSucceeded()
int i = 0;
for (auto &modUrl: modUrls)
{
- m_filesNetJob->addNetAction(Net::Download::makeFile(modUrl, m_outputDir.filePath(QString("%1").arg(i))));
+ auto path = FS::PathCombine(m_outputDir.path(), QString("%1").arg(i));
+ m_filesNetJob->addNetAction(Net::Download::makeFile(modUrl, path));
i++;
}
@@ -116,7 +117,8 @@ void Technic::SolderPackInstallTask::downloadSucceeded()
while (m_modCount > i)
{
- if (MMCZip::extractDir(m_outputDir.filePath(QString("%1").arg(i)), extractDir).isEmpty())
+ auto path = FS::PathCombine(m_outputDir.path(), QString("%1").arg(i));
+ if (MMCZip::extractDir(path, extractDir).isEmpty())
{
return false;
}