dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into feature/java-downloader

Browse source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2023-08-16 13:33:08 +01:00
commit 8778313170
No known key found for this signature in database
GPG key ID: 5E39D70B4C93C38E
731 changed files with 20290 additions and 18966 deletions
Download patch file Download diff file Expand all files Collapse all files

10
launcher/JavaDownloader.cpp
View file

@ -80,9 +80,8 @@ void JavaDownloader::parseMojangManifest(bool isLegacy, const QJsonArray& versio
download->addNetAction(Net::Download::makeByteArray(QUrl(url), files));
connect(download.get(), &NetJob::finished, [download, files, this] {
disconnect(this, &Task::aborted, download.get(), &NetJob::abort);
});
connect(download.get(), &NetJob::finished,
[download, files, this] { disconnect(this, &Task::aborted, download.get(), &NetJob::abort); });
connect(download.get(), &NetJob::progress, this, &JavaDownloader::progress);
connect(download.get(), &NetJob::failed, this, &JavaDownloader::emitFailed);
connect(this, &Task::aborted, download.get(), &NetJob::abort);
@ -177,9 +176,8 @@ void JavaDownloader::downloadAzulMeta(const QString& OS, bool isLegacy, const Ne
)
.arg(javaVersion, azulOS, arch, bitness),
metaResponse));
connect(downloadJob.get(), &NetJob::finished, [downloadJob, metaResponse, this] {
disconnect(this, &Task::aborted, downloadJob.get(), &NetJob::abort);
});
connect(downloadJob.get(), &NetJob::finished,
[downloadJob, metaResponse, this] { disconnect(this, &Task::aborted, downloadJob.get(), &NetJob::abort); });
connect(this, &Task::aborted, downloadJob.get(), &NetJob::abort);
connect(netJob, &NetJob::failed, this, &JavaDownloader::emitFailed);
connect(downloadJob.get(), &NetJob::progress, this, &JavaDownloader::progress);