diff options
| author | Sky <git@bunnies.cc> | 2013-12-11 03:54:39 +0000 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-12-11 04:54:00 +0000 |
| commit | afa5e14e2074343270ff205e042f102c03dface0 (patch) | |
| tree | 1b72b755c5b7292742b048aec4b4a77af8dec4ac /gui | |
| parent | ab69c1b9e6c25e92ded4a6ac6774e468a2e08b7b (diff) | |
| download | MultiMC-afa5e14e2074343270ff205e042f102c03dface0.tar MultiMC-afa5e14e2074343270ff205e042f102c03dface0.tar.gz MultiMC-afa5e14e2074343270ff205e042f102c03dface0.tar.lz MultiMC-afa5e14e2074343270ff205e042f102c03dface0.tar.xz MultiMC-afa5e14e2074343270ff205e042f102c03dface0.zip | |
Better (but unsorted) Java detection
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/dialogs/InstanceSettings.cpp | 3 | ||||
| -rw-r--r-- | gui/dialogs/SettingsDialog.cpp | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gui/dialogs/InstanceSettings.cpp b/gui/dialogs/InstanceSettings.cpp index bc6b266a..641c7fab 100644 --- a/gui/dialogs/InstanceSettings.cpp +++ b/gui/dialogs/InstanceSettings.cpp @@ -220,7 +220,8 @@ void InstanceSettings::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 InstanceSettings::checkFinished(JavaCheckResult result) diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp index 5dcf60f8..e7f537e3 100644 --- a/gui/dialogs/SettingsDialog.cpp +++ b/gui/dialogs/SettingsDialog.cpp @@ -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 |