diff options
| author | AliceDTRH <57547425+AliceDTRH@users.noreply.github.com> | 2022-10-22 16:40:31 +0200 |
|---|---|---|
| committer | AliceDTRH <57547425+AliceDTRH@users.noreply.github.com> | 2022-10-22 16:40:31 +0200 |
| commit | 1471eddc7e9a5383218daf0fb271987d81e7096b (patch) | |
| tree | b04ae1317563329cb77ff2d4d1a6f2f4dcf4c8e0 | |
| parent | a9d4370ad462b4ad3dd91f6bc38b40262967b5b2 (diff) | |
| download | PrismLauncher-1471eddc7e9a5383218daf0fb271987d81e7096b.tar.gz PrismLauncher-1471eddc7e9a5383218daf0fb271987d81e7096b.tar.bz2 PrismLauncher-1471eddc7e9a5383218daf0fb271987d81e7096b.zip | |
Deduplicates java installs before passing it on
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
| -rw-r--r-- | launcher/java/JavaUtils.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index 040fe821..81b3a0b2 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() |