From 44e1b2a19a869b907b40e56c85c8a47aa6c22097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Tue, 22 Jun 2021 21:50:11 +0300 Subject: [PATCH] pick latest java first --- api/logic/java/JavaInstallList.cpp | 4 ++-- api/logic/java/JavaUtils.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/logic/java/JavaInstallList.cpp b/api/logic/java/JavaInstallList.cpp index 0bded03c..40898e20 100644 --- a/api/logic/java/JavaInstallList.cpp +++ b/api/logic/java/JavaInstallList.cpp @@ -120,8 +120,8 @@ void JavaInstallList::updateListData(QList versions) bool sortJavas(BaseVersionPtr left, BaseVersionPtr right) { - auto rleft = std::dynamic_pointer_cast(left); - auto rright = std::dynamic_pointer_cast(right); + auto rleft = std::dynamic_pointer_cast(right); + auto rright = std::dynamic_pointer_cast(left); return (*rleft) > (*rright); } diff --git a/api/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp index 5f004a10..6d633631 100644 --- a/api/logic/java/JavaUtils.cpp +++ b/api/logic/java/JavaUtils.cpp @@ -350,7 +350,6 @@ QList JavaUtils::FindJavaPaths() qDebug() << "Linux Java detection incomplete - defaulting to \"java\""; QList javas; - javas.append(this->GetDefaultJava()->path); auto scanJavaDir = [&](const QString & dirPath) { QDir dir(dirPath); @@ -379,6 +378,7 @@ QList JavaUtils::FindJavaPaths() // general locations used by distro packaging scanJavaDir("/usr/lib/jvm"); scanJavaDir("/usr/lib32/jvm"); + javas.append(this->GetDefaultJava()->path); // javas stored in MultiMC's folder scanJavaDir("java"); return javas; -- 2.31.1