From 1471eddc7e9a5383218daf0fb271987d81e7096b Mon Sep 17 00:00:00 2001
From: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
Date: Sat, 22 Oct 2022 16:40:31 +0200
Subject: [PATCH] Deduplicates java installs before passing it on

Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
---
 launcher/java/JavaUtils.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
index 040fe8210..81b3a0b2c 100644
--- a/launcher/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.cpp
@@ -379,7 +379,9 @@ QList<QString> JavaUtils::FindJavaPaths()
         }
     }
 
-    return addJavasFromEnv(candidates);
+    javas = addJavasFromEnv(javas);
+    javas.removeDuplicates();
+    return javas;
 }
 
 #elif defined(Q_OS_MAC)
@@ -402,7 +404,9 @@ QList<QString> JavaUtils::FindJavaPaths()
         javas.append(systemLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/bin/java");
         javas.append(systemLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Commands/java");
     }
-    return addJavasFromEnv(javas);
+    javas = addJavasFromEnv(javas);
+    javas.removeDuplicates();
+    return javas;
 }
 
 #elif defined(Q_OS_LINUX)
@@ -448,7 +452,9 @@ QList<QString> JavaUtils::FindJavaPaths()
     scanJavaDir("/opt/jdks");
     // flatpak
     scanJavaDir("/app/jdk");
-    return addJavasFromEnv(javas);
+    javas = addJavasFromEnv(javas);
+    javas.removeDuplicates();
+    return javas;
 }
 #else
 QList<QString> JavaUtils::FindJavaPaths()