summaryrefslogtreecommitdiffstats
path: root/gui/settingsdialog.cpp
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-10-06 19:54:52 +0100
committerSky <git@bunnies.cc>2013-10-06 19:54:52 +0100
commit17c98655f86f8ea41c4528e3fc25d12388a36861 (patch)
tree38591551b6bfe792ffd287ec68831b9801e0260e /gui/settingsdialog.cpp
parentd5e4802adef575d1d2d20a3e6e5addd4b5f4d2ca (diff)
downloadMultiMC-17c98655f86f8ea41c4528e3fc25d12388a36861.tar
MultiMC-17c98655f86f8ea41c4528e3fc25d12388a36861.tar.gz
MultiMC-17c98655f86f8ea41c4528e3fc25d12388a36861.tar.lz
MultiMC-17c98655f86f8ea41c4528e3fc25d12388a36861.tar.xz
MultiMC-17c98655f86f8ea41c4528e3fc25d12388a36861.zip
First draft of multiple Java installation detection on Windows
Diffstat (limited to 'gui/settingsdialog.cpp')
-rw-r--r--gui/settingsdialog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index c6fe893d..011925b7 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -185,9 +185,9 @@ void SettingsDialog::loadSettings(SettingsObject *s)
void SettingsDialog::on_pushButton_clicked()
{
JavaUtils jut;
- QStringList paths = jut.FindJavaPath();
+ auto javas = jut.FindJavaPaths();
- ui->javaPathTextBox->setText(paths.at(0));
+ ui->javaPathTextBox->setText(std::get<JI_PATH>(javas.at(0)));
}
void SettingsDialog::on_btnBrowse_clicked()