CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #234 from AliceDTRH/fix/dedupejava

Browse Source
This commit is contained in:
flow 2022-10-22 13:14:26 -03:00 committed by Sefa Eyeoglu
parent cac800bfd8
commit c08b632b51
No known key found for this signature in database
GPG Key ID: C10411294912A422
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
launcher/java/JavaUtils.cpp
View File

@ -379,7 +379,9 @@ QList<QString> JavaUtils::FindJavaPaths()
} }
} }
return addJavasFromEnv(candidates); candidates = addJavasFromEnv(candidates);
candidates.removeDuplicates();
return candidates;
} }
#elif defined(Q_OS_MAC) #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/Home/bin/java");
javas.append(systemLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Commands/java"); javas.append(systemLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Commands/java");
} }
return addJavasFromEnv(javas); javas = addJavasFromEnv(javas);
javas.removeDuplicates();
return javas;
} }
#elif defined(Q_OS_LINUX) #elif defined(Q_OS_LINUX)
@ -448,7 +452,9 @@ QList<QString> JavaUtils::FindJavaPaths()
scanJavaDir("/opt/jdks"); scanJavaDir("/opt/jdks");
// flatpak // flatpak
scanJavaDir("/app/jdk"); scanJavaDir("/app/jdk");
return addJavasFromEnv(javas); javas = addJavasFromEnv(javas);
javas.removeDuplicates();
return javas;
} }
#else #else
QList<QString> JavaUtils::FindJavaPaths() QList<QString> JavaUtils::FindJavaPaths()