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

Better (but unsorted) Java detection

Browse source
This commit is contained in:
Sky 2013-12-11 03:54:39 +00:00
parent ab69c1b9e6
commit afa5e14e20
13 changed files with 338 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gui/dialogs/SettingsDialog.cpp
View file

@ -259,7 +259,8 @@ void SettingsDialog::on_javaTestBtn_clicked()
checker.reset(new JavaChecker());
connect(checker.get(), SIGNAL(checkFinished(JavaCheckResult)), this,
SLOT(checkFinished(JavaCheckResult)));
checker->performCheck(ui->javaPathTextBox->text());
checker->path = ui->javaPathTextBox->text();
checker->performCheck();
}
void SettingsDialog::checkFinished(JavaCheckResult result)
@ -271,7 +272,8 @@ void SettingsDialog::checkFinished(JavaCheckResult result)
if (result.is_64bit)
text += "Using 64bit java.\n";
text += "\n";
text += "Platform reported: " + result.realPlatform;
text += "Platform reported: " + result.realPlatform + "\n";
text += "Java version reported: " + result.javaVersion;
QMessageBox::information(this, tr("Java test success"), text);
}
else