diff options
| author | Sky <git@bunnies.cc> | 2014-01-02 19:49:12 +0000 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2014-01-02 19:49:12 +0000 |
| commit | f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f (patch) | |
| tree | 6ccc6671f06312a54d14bfc5c78dea95f721857c /logic | |
| parent | 47d577b7669e2ff7ea331f75e33911ddf7bffd05 (diff) | |
| parent | aa5f2c8120cc23de0d57c9f0280512adb9a531b3 (diff) | |
| download | MultiMC-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.tar MultiMC-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.tar.gz MultiMC-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.tar.lz MultiMC-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.tar.xz MultiMC-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/JavaUtils.cpp | 4 | ||||
| -rw-r--r-- | logic/icons/IconList.cpp | 4 |
2 files changed, 4 insertions, 4 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; } diff --git a/logic/icons/IconList.cpp b/logic/icons/IconList.cpp index 3a745662..cda2db7b 100644 --- a/logic/icons/IconList.cpp +++ b/logic/icons/IconList.cpp @@ -258,7 +258,7 @@ void IconList::installIcons(QStringList iconFiles) QString target = PathCombine("icons", fileinfo.fileName()); QString suffix = fileinfo.suffix(); - if (suffix != "jpeg" && suffix != "png" && suffix != "jpg") + if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico") continue; if (!QFile::copy(file, target)) @@ -348,4 +348,4 @@ int IconList::getIconIndex(QString key) return -1; } -//#include "IconList.moc"
\ No newline at end of file +//#include "IconList.moc" |