From cdebeff179b78b9acb013cea7a9b71f45bef751d Mon Sep 17 00:00:00 2001
From: Noah Mayr <max96at@gmail.com>
Date: Thu, 2 Jan 2014 17:01:26 +0100
Subject: Improved java detection on OSX.

---
 logic/JavaUtils.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/logic/JavaUtils.cpp b/logic/JavaUtils.cpp
index e1b3bc64..8005c375 100644
--- a/logic/JavaUtils.cpp
+++ b/logic/JavaUtils.cpp
@@ -181,6 +181,8 @@ QList<QString> JavaUtils::FindJavaPaths()
 
 	QList<QString> javas;
 	javas.append(this->GetDefaultJava()->path);
+	javas.append("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java");
+	javas.append("/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java");
 
 	return javas;
 }
-- 
cgit v1.2.3


From 092b15fc8716af61472ffdd953429792183b350d Mon Sep 17 00:00:00 2001
From: max96at <max96at@gmail.com>
Date: Thu, 2 Jan 2014 17:07:47 +0100
Subject: Removed incomplete osx java detection log message

---
 logic/JavaUtils.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/logic/JavaUtils.cpp b/logic/JavaUtils.cpp
index 8005c375..cf47df6f 100644
--- a/logic/JavaUtils.cpp
+++ b/logic/JavaUtils.cpp
@@ -177,8 +177,6 @@ QList<QString> JavaUtils::FindJavaPaths()
 #elif OSX
 QList<QString> JavaUtils::FindJavaPaths()
 {
-	QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\"";
-
 	QList<QString> javas;
 	javas.append(this->GetDefaultJava()->path);
 	javas.append("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java");
-- 
cgit v1.2.3