diff options
author | dada513 <dada513@protonmail.com> | 2021-12-31 18:05:40 +0100 |
---|---|---|
committer | dada513 <dada513@protonmail.com> | 2021-12-31 18:05:40 +0100 |
commit | fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3 (patch) | |
tree | 5a300af57c0207d38980319d54dc04218828aa1e /launcher/minecraft/update/AssetUpdateTask.cpp | |
parent | 0c177b1086d69993e012ba1fbed1adf6bfe04144 (diff) | |
parent | 9579231ccc36d9d32f4d5571ced91e8fe7851643 (diff) | |
download | PrismLauncher-fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3.tar.gz PrismLauncher-fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3.tar.bz2 PrismLauncher-fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3.zip |
Merge remote-tracking branch 'upstream/develop' into upstream_update
Diffstat (limited to 'launcher/minecraft/update/AssetUpdateTask.cpp')
-rw-r--r-- | launcher/minecraft/update/AssetUpdateTask.cpp | 9 |
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(); |