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/modplatform/atlauncher | |
| 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/modplatform/atlauncher')
| -rw-r--r-- | launcher/modplatform/atlauncher/ATLPackInstallTask.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp index 7352d174..e5db512e 100644 --- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp +++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp @@ -58,12 +58,12 @@ bool PackInstallTask::abort() void PackInstallTask::executeTask() { qDebug() << "PackInstallTask::executeTask: " << QThread::currentThreadId(); - auto *netJob = new NetJob("ATLauncher::VersionFetch"); + auto *netJob = new NetJob("ATLauncher::VersionFetch", APPLICATION->network()); auto searchUrl = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "packs/%1/versions/%2/Configs.json") .arg(m_pack).arg(m_version_name); netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response)); jobPtr = netJob; - jobPtr->start(APPLICATION->network()); + jobPtr->start(); QObject::connect(netJob, &NetJob::succeeded, this, &PackInstallTask::onDownloadSucceeded); QObject::connect(netJob, &NetJob::failed, this, &PackInstallTask::onDownloadFailed); @@ -424,7 +424,7 @@ void PackInstallTask::installConfigs() { qDebug() << "PackInstallTask::installConfigs: " << QThread::currentThreadId(); setStatus(tr("Downloading configs...")); - jobPtr.reset(new NetJob(tr("Config download"))); + jobPtr = new NetJob(tr("Config download"), APPLICATION->network()); auto path = QString("Configs/%1/%2.zip").arg(m_pack).arg(m_version_name); auto url = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "packs/%1/versions/%2/Configs.zip") @@ -458,7 +458,7 @@ void PackInstallTask::installConfigs() setProgress(current, total); }); - jobPtr->start(APPLICATION->network()); + jobPtr->start(); } void PackInstallTask::extractConfigs() @@ -508,7 +508,7 @@ void PackInstallTask::downloadMods() setStatus(tr("Downloading mods...")); jarmods.clear(); - jobPtr.reset(new NetJob(tr("Mod download"))); + jobPtr = new NetJob(tr("Mod download"), APPLICATION->network()); for(const auto& mod : m_version.mods) { // skip non-client mods if(!mod.client) continue; @@ -613,7 +613,7 @@ void PackInstallTask::downloadMods() setProgress(current, total); }); - jobPtr->start(APPLICATION->network()); + jobPtr->start(); } void PackInstallTask::onModsDownloaded() { |