aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
diff options
context:
space:
mode:
authordada513 <dada513@protonmail.com>2021-12-31 18:05:40 +0100
committerdada513 <dada513@protonmail.com>2021-12-31 18:05:40 +0100
commitfa98ed3ccd74cbf0228baf13851b6bb6d17d51a3 (patch)
tree5a300af57c0207d38980319d54dc04218828aa1e /launcher/modplatform/legacy_ftb/PackFetchTask.cpp
parent0c177b1086d69993e012ba1fbed1adf6bfe04144 (diff)
parent9579231ccc36d9d32f4d5571ced91e8fe7851643 (diff)
downloadPrismLauncher-fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3.tar.gz
PrismLauncher-fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3.tar.bz2
PrismLauncher-fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3.zip
Merge remote-tracking branch 'upstream/develop' into upstream_update
Diffstat (limited to 'launcher/modplatform/legacy_ftb/PackFetchTask.cpp')
-rw-r--r--launcher/modplatform/legacy_ftb/PackFetchTask.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/launcher/modplatform/legacy_ftb/PackFetchTask.cpp b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
index ecf36188..961fe868 100644
--- a/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
@@ -12,7 +12,7 @@ void PackFetchTask::fetch()
publicPacks.clear();
thirdPartyPacks.clear();
- jobPtr = new NetJob("LegacyFTB::ModpackFetch");
+ jobPtr = new NetJob("LegacyFTB::ModpackFetch", m_network);
QUrl publicPacksUrl = QUrl(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/modpacks.xml");
qDebug() << "Downloading public version info from" << publicPacksUrl.toString();
@@ -25,7 +25,7 @@ void PackFetchTask::fetch()
QObject::connect(jobPtr.get(), &NetJob::succeeded, this, &PackFetchTask::fileDownloadFinished);
QObject::connect(jobPtr.get(), &NetJob::failed, this, &PackFetchTask::fileDownloadFailed);
- jobPtr->start(m_network);
+ jobPtr->start();
}
void PackFetchTask::fetchPrivate(const QStringList & toFetch)
@@ -35,7 +35,7 @@ void PackFetchTask::fetchPrivate(const QStringList & toFetch)
for (auto &packCode: toFetch)
{
QByteArray *data = new QByteArray();
- NetJob *job = new NetJob("Fetching private pack");
+ NetJob *job = new NetJob("Fetching private pack", m_network);
job->addNetAction(Net::Download::makeByteArray(privatePackBaseUrl.arg(packCode), data));
QObject::connect(job, &NetJob::succeeded, this, [this, job, data, packCode]
@@ -63,7 +63,7 @@ void PackFetchTask::fetchPrivate(const QStringList & toFetch)
delete data;
});
- job->start(m_network);
+ job->start();
}
}