diff options
| author | Sky <git@bunnies.cc> | 2013-10-07 08:02:59 -0700 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-10-07 08:02:59 -0700 |
| commit | 0bf8d9df5cc102fcec496ba3c5cf15477e726516 (patch) | |
| tree | 47a22f0353953061a532f103c9d9a92a18a427f9 /gui/settingsdialog.cpp | |
| parent | d5e4802adef575d1d2d20a3e6e5addd4b5f4d2ca (diff) | |
| parent | b30a97d4c9315e482341ec863dc5722bf78c4631 (diff) | |
| download | MultiMC-0bf8d9df5cc102fcec496ba3c5cf15477e726516.tar MultiMC-0bf8d9df5cc102fcec496ba3c5cf15477e726516.tar.gz MultiMC-0bf8d9df5cc102fcec496ba3c5cf15477e726516.tar.lz MultiMC-0bf8d9df5cc102fcec496ba3c5cf15477e726516.tar.xz MultiMC-0bf8d9df5cc102fcec496ba3c5cf15477e726516.zip | |
Merge pull request #3 from Drayshak/develop
Fix window size setting for 1.6+, improve Windows Java detection
Diffstat (limited to 'gui/settingsdialog.cpp')
| -rw-r--r-- | gui/settingsdialog.cpp | 4 |
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() |