summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-12-11 08:39:35 +0100
committerPetr Mrázek <peterix@gmail.com>2013-12-11 08:39:35 +0100
commit26a7544325f8fd8939567b270bde9ad1db465f9f (patch)
treea901f9bee1cb6ff019b95fa2776b0dd3be1b45c3 /gui
parentbace3c2eab1effd556ab2c704b26220312e05eb3 (diff)
parentafa5e14e2074343270ff205e042f102c03dface0 (diff)
downloadMultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar
MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar.gz
MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar.lz
MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar.xz
MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.zip
Merge https://github.com/Drayshak/MultiMC5 into develop
Diffstat (limited to 'gui')
-rw-r--r--gui/dialogs/InstanceSettings.cpp3
-rw-r--r--gui/dialogs/SettingsDialog.cpp6
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