From 1dee4bb60d08995f0fd4eb229f131f2ca546d24c Mon Sep 17 00:00:00 2001
From: Sky <git@bunnies.cc>
Date: Sat, 5 Oct 2013 01:08:13 +0100
Subject: Add naive Windows Java detection - JavaUtils for finding it on other
 systems (incomplete)

---
 gui/settingsdialog.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'gui/settingsdialog.cpp')

diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index 9736c1c7..b5ff8d56 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -13,10 +13,11 @@
  * limitations under the License.
  */
 
+#include <MultiMC.h>
 #include "settingsdialog.h"
 #include "ui_settingsdialog.h"
+#include "logic/JavaUtils.h"
 
-#include <MultiMC.h>
 #include <settingsobject.h>
 #include <QFileDialog>
 #include <QMessageBox>
@@ -180,3 +181,11 @@ void SettingsDialog::loadSettings(SettingsObject *s)
 	ui->preLaunchCmdTextBox->setText(s->get("PreLaunchCommand").toString());
 	ui->postExitCmdTextBox->setText(s->get("PostExitCommand").toString());
 }
+
+void SettingsDialog::on_pushButton_clicked()
+{
+	JavaUtils jut;
+	QStringList paths = jut.FindJavaPath();
+
+	ui->javaPathTextBox->setText(paths.at(0));
+}
-- 
cgit