diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-02 08:09:57 -0800 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-02 08:09:57 -0800 |
| commit | c85789e249056f5496bb13ed6f85f894ab0682dd (patch) | |
| tree | e56c5b2505288e1e116060043a25ed31f90620f5 | |
| parent | aed3ddda2950f00f2e1a884f1b7f31b7c4780ae5 (diff) | |
| parent | 092b15fc8716af61472ffdd953429792183b350d (diff) | |
| download | MultiMC-c85789e249056f5496bb13ed6f85f894ab0682dd.tar MultiMC-c85789e249056f5496bb13ed6f85f894ab0682dd.tar.gz MultiMC-c85789e249056f5496bb13ed6f85f894ab0682dd.tar.lz MultiMC-c85789e249056f5496bb13ed6f85f894ab0682dd.tar.xz MultiMC-c85789e249056f5496bb13ed6f85f894ab0682dd.zip | |
Merge pull request #31 from max96at/feature_osx_polish
Improved java detection on OSX.
| -rw-r--r-- | logic/JavaUtils.cpp | 4 |
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; } |