pyrox.dev
1From 44e1b2a19a869b907b40e56c85c8a47aa6c22097 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <musfay@protonmail.com>
3Date: Tue, 22 Jun 2021 21:50:11 +0300
4Subject: [PATCH] pick latest java first
5
6---
7 launcher/java/JavaInstallList.cpp | 4 ++--
8 launcher/java/JavaUtils.cpp | 2 +-
9 2 files changed, 3 insertions(+), 3 deletions(-)
10
11diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp
12index 0bded03c..40898e20 100644
13--- a/launcher/java/JavaInstallList.cpp
14+++ b/launcher/java/JavaInstallList.cpp
15@@ -120,8 +120,8 @@ void JavaInstallList::updateListData(QList<BaseVersionPtr> versions)
16
17 bool sortJavas(BaseVersionPtr left, BaseVersionPtr right)
18 {
19- auto rleft = std::dynamic_pointer_cast<JavaInstall>(left);
20- auto rright = std::dynamic_pointer_cast<JavaInstall>(right);
21+ auto rleft = std::dynamic_pointer_cast<JavaInstall>(right);
22+ auto rright = std::dynamic_pointer_cast<JavaInstall>(left);
23 return (*rleft) > (*rright);
24 }
25
26diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
27index 5f004a10..6d633631 100644
28--- a/launcher/java/JavaUtils.cpp
29+++ b/launcher/java/JavaUtils.cpp
30@@ -350,7 +350,6 @@ QList<QString> JavaUtils::FindJavaPaths()
31 qDebug() << "Linux Java detection incomplete - defaulting to \"java\"";
32
33 QList<QString> javas;
34- javas.append(this->GetDefaultJava()->path);
35 auto scanJavaDir = [&](const QString & dirPath)
36 {
37 QDir dir(dirPath);
38@@ -379,6 +378,7 @@ QList<QString> JavaUtils::FindJavaPaths()
39 // general locations used by distro packaging
40 scanJavaDir("/usr/lib/jvm");
41 scanJavaDir("/usr/lib32/jvm");
42+ javas.append(this->GetDefaultJava()->path);
43 // javas stored in MultiMC's folder
44 scanJavaDir("java");
45 return javas;
46--
472.31.1
48