mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-30 18:36:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix partial java download (#4472)

Browse source
This commit is contained in:
Alexandru Ionut Tripon 2025-12-14 00:55:05 +02:00 • committed by GitHub
commit ed63a355b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
launcher/minecraft/launch/AutoInstallJava.cpp
View file

@ -109,7 +109,8 @@ void AutoInstallJava::executeTask()
return;
}
QDir javaDir(APPLICATION->javaPath());
auto wantedJavaPath = javaDir.absoluteFilePath(wantedJavaName);
auto relativeBinary = FS::PathCombine(wantedJavaName, "bin", JavaUtils::javaExecutable);
auto wantedJavaPath = javaDir.absoluteFilePath(relativeBinary);
if (QFileInfo::exists(wantedJavaPath)) {
setJavaPathFromPartial();
return;
@ -165,6 +166,7 @@ void AutoInstallJava::downloadJava(Meta::Version::Ptr version, QString javaName)
if (java->runtimeOS == m_supported_arch && java->name() == javaName) {
QDir javaDir(APPLICATION->javaPath());
auto final_path = javaDir.absoluteFilePath(java->m_name);
auto deletePath = [final_path] { FS::deletePath(final_path); };
switch (java->downloadType) {
case Java::DownloadType::Manifest:
m_current_task = makeShared<Java::ManifestDownloadTask>(java->url, final_path, java->checksumType, java->checksumHash);
@ -174,6 +176,7 @@ void AutoInstallJava::downloadJava(Meta::Version::Ptr version, QString javaName)
break;
case Java::DownloadType::Unknown:
emitFailed(tr("Could not determine Java download type!"));
deletePath();
return;
}
#if defined(Q_OS_MACOS)
@ -182,12 +185,11 @@ void AutoInstallJava::downloadJava(Meta::Version::Ptr version, QString javaName)
seq->addTask(makeShared<Java::SymlinkTask>(final_path));
m_current_task = seq;
#endif
auto deletePath = [final_path] { FS::deletePath(final_path); };
connect(m_current_task.get(), &Task::failed, this, [this, deletePath](QString reason) {
deletePath();
emitFailed(reason);
});
connect(m_current_task.get(), &Task::aborted, this, [deletePath] { deletePath(); });
connect(m_current_task.get(), &Task::aborted, this, deletePath);
connect(m_current_task.get(), &Task::succeeded, this, &AutoInstallJava::setJavaPathFromPartial);
connect(m_current_task.get(), &Task::failed, this, &AutoInstallJava::tryNextMajorJava);
connect(m_current_task.get(), &Task::progress, this, &AutoInstallJava::setProgress);

1
launcher/ui/java/InstallJavaDialog.cpp
View file

@ -318,6 +318,7 @@ void InstallDialog::done(int result)
QString error = QString(tr("Could not determine Java download type!"));
CustomMessageBox::selectable(this, tr("Error"), error, QMessageBox::Warning)->show();
deletePath();
return;
}
#if defined(Q_OS_MACOS)
auto seq = makeShared<SequentialTask>(tr("Install Java"));