aboutsummaryrefslogtreecommitdiff
path: root/logic/JavaUtils.cpp
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2014-01-02 19:49:12 +0000
committerSky <git@bunnies.cc>2014-01-02 19:49:12 +0000
commitf08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f (patch)
tree6ccc6671f06312a54d14bfc5c78dea95f721857c /logic/JavaUtils.cpp
parent47d577b7669e2ff7ea331f75e33911ddf7bffd05 (diff)
parentaa5f2c8120cc23de0d57c9f0280512adb9a531b3 (diff)
downloadPrismLauncher-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.tar.gz
PrismLauncher-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.tar.bz2
PrismLauncher-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.zip
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'logic/JavaUtils.cpp')
-rw-r--r--logic/JavaUtils.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/JavaUtils.cpp b/logic/JavaUtils.cpp
index e1b3bc64..cf47df6f 100644
--- a/logic/JavaUtils.cpp
+++ b/logic/JavaUtils.cpp
@@ -177,10 +177,10 @@ 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");
+ javas.append("/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java");
return javas;
}