aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/update/AssetUpdateTask.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2021-12-31 05:27:59 +0100
committerPetr Mrázek <peterix@gmail.com>2021-12-31 05:27:59 +0100
commit9579231ccc36d9d32f4d5571ced91e8fe7851643 (patch)
treed91a8a010d6159d6a9b058b8383fc1da0d765bb7 /launcher/minecraft/update/AssetUpdateTask.cpp
parent9cc168c5261c6cd0523287e995da58beee8f5096 (diff)
downloadPrismLauncher-9579231ccc36d9d32f4d5571ced91e8fe7851643.tar.gz
PrismLauncher-9579231ccc36d9d32f4d5571ced91e8fe7851643.tar.bz2
PrismLauncher-9579231ccc36d9d32f4d5571ced91e8fe7851643.zip
NOISSUE fix build and change how NetJob is used
Feed it network upfront...
Diffstat (limited to 'launcher/minecraft/update/AssetUpdateTask.cpp')
-rw-r--r--launcher/minecraft/update/AssetUpdateTask.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/launcher/minecraft/update/AssetUpdateTask.cpp b/launcher/minecraft/update/AssetUpdateTask.cpp
index 096e1719..c4bddb08 100644
--- a/launcher/minecraft/update/AssetUpdateTask.cpp
+++ b/launcher/minecraft/update/AssetUpdateTask.cpp
@@ -24,7 +24,10 @@ void AssetUpdateTask::executeTask()
auto assets = profile->getMinecraftAssets();
QUrl indexUrl = assets->url;
QString localPath = assets->id + ".json";
- auto job = new NetJob(tr("Asset index for %1").arg(m_inst->name()));
+ auto job = new NetJob(
+ tr("Asset index for %1").arg(m_inst->name()),
+ APPLICATION->network()
+ );
auto metacache = APPLICATION->metacache();
auto entry = metacache->resolveEntry("asset_indexes", localPath);
@@ -43,7 +46,7 @@ void AssetUpdateTask::executeTask()
connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress);
qDebug() << m_inst->name() << ": Starting asset index download";
- downloadJob->start(APPLICATION->network());
+ downloadJob->start();
}
bool AssetUpdateTask::canAbort() const
@@ -78,7 +81,7 @@ void AssetUpdateTask::assetIndexFinished()
connect(downloadJob.get(), &NetJob::succeeded, this, &AssetUpdateTask::emitSucceeded);
connect(downloadJob.get(), &NetJob::failed, this, &AssetUpdateTask::assetsFailed);
connect(downloadJob.get(), &NetJob::progress, this, &AssetUpdateTask::progress);
- downloadJob->start(APPLICATION->network());
+ downloadJob->start();
return;
}
emitSucceeded();