summaryrefslogtreecommitdiffstats
path: root/logic/JavaUtils.cpp
diff options
context:
space:
mode:
authorNoah Mayr <max96at@gmail.com>2014-01-02 17:01:26 +0100
committerNoah Mayr <max96at@gmail.com>2014-01-02 17:01:26 +0100
commitcdebeff179b78b9acb013cea7a9b71f45bef751d (patch)
tree40eec752258a40b2eb5058c06eb3d81b1cbf4103 /logic/JavaUtils.cpp
parentaed3ddda2950f00f2e1a884f1b7f31b7c4780ae5 (diff)
downloadMultiMC-cdebeff179b78b9acb013cea7a9b71f45bef751d.tar
MultiMC-cdebeff179b78b9acb013cea7a9b71f45bef751d.tar.gz
MultiMC-cdebeff179b78b9acb013cea7a9b71f45bef751d.tar.lz
MultiMC-cdebeff179b78b9acb013cea7a9b71f45bef751d.tar.xz
MultiMC-cdebeff179b78b9acb013cea7a9b71f45bef751d.zip
Improved java detection on OSX.
Diffstat (limited to 'logic/JavaUtils.cpp')
-rw-r--r--logic/JavaUtils.cpp2
1 files changed, 2 insertions, 0 deletions
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;
}