diff options
| author | flow <flowlnlnln@gmail.com> | 2022-10-22 13:14:26 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-22 13:14:26 -0300 |
| commit | 8b28ed67ae25ed95c73e5c486b2a5e81b3a72268 (patch) | |
| tree | 379b31a0607535432df9c49fad456f7d6daa32fc /launcher | |
| parent | 9bb62e1bba5724bf05ec039d6631d994ade3ca86 (diff) | |
| parent | b2789fef0fd91b6088bc8ec5ea17ea3b59810c96 (diff) | |
| download | PrismLauncher-8b28ed67ae25ed95c73e5c486b2a5e81b3a72268.tar.gz PrismLauncher-8b28ed67ae25ed95c73e5c486b2a5e81b3a72268.tar.bz2 PrismLauncher-8b28ed67ae25ed95c73e5c486b2a5e81b3a72268.zip | |
Merge pull request #234 from AliceDTRH/fix/dedupejava
Diffstat (limited to 'launcher')
| -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..6c0c60cd 100644 --- a/launcher/java/JavaUtils.cpp +++ b/launcher/java/JavaUtils.cpp @@ -379,7 +379,9 @@ QList<QString> JavaUtils::FindJavaPaths() } } - return addJavasFromEnv(candidates); + candidates = addJavasFromEnv(candidates); + candidates.removeDuplicates(); + return candidates; } #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() |