diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2021-05-24 02:41:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-24 02:41:08 +0200 |
| commit | 3a8068e75f4f818417f17c524af928ba295e775a (patch) | |
| tree | eea85bb4e0118c7753a015fee02bd15ef43a1fe0 | |
| parent | 911074e9669b6399df983a570c734018c2abd139 (diff) | |
| parent | f78152d725c83ddaf8c58b50996eac2e998b2e5c (diff) | |
| download | PrismLauncher-3a8068e75f4f818417f17c524af928ba295e775a.tar.gz PrismLauncher-3a8068e75f4f818417f17c524af928ba295e775a.tar.bz2 PrismLauncher-3a8068e75f4f818417f17c524af928ba295e775a.zip | |
Merge pull request #3803 from phit/patch-1
NOISSUE Fix new Oracle Java Detection on Windows
| -rw-r--r-- | api/logic/java/JavaUtils.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/api/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp index 647711e5..18a731ca 100644 --- a/api/logic/java/JavaUtils.cpp +++ b/api/logic/java/JavaUtils.cpp @@ -241,21 +241,33 @@ QList<QString> JavaUtils::FindJavaPaths() KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment"); QList<JavaInstallPtr> JDK64s = this->FindJavaFromRegistryKey( KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Development Kit"); + QList<JavaInstallPtr> NEWJRE64s = this->FindJavaFromRegistryKey( + KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\JRE"); + QList<JavaInstallPtr> NEWJDK64s = this->FindJavaFromRegistryKey( + KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\JDK"); QList<JavaInstallPtr> JRE32s = this->FindJavaFromRegistryKey( KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment"); QList<JavaInstallPtr> JDK32s = this->FindJavaFromRegistryKey( KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit"); + QList<JavaInstallPtr> NEWJRE32s = this->FindJavaFromRegistryKey( + KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\JRE"); + QList<JavaInstallPtr> NEWJDK32s = this->FindJavaFromRegistryKey( + KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\JDK"); java_candidates.append(JRE64s); + java_candidates.append(NEWJRE64s); java_candidates.append(MakeJavaPtr("C:/Program Files/Java/jre8/bin/javaw.exe")); java_candidates.append(MakeJavaPtr("C:/Program Files/Java/jre7/bin/javaw.exe")); java_candidates.append(MakeJavaPtr("C:/Program Files/Java/jre6/bin/javaw.exe")); java_candidates.append(JDK64s); + java_candidates.append(NEWJDK64s); java_candidates.append(JRE32s); + java_candidates.append(NEWJRE32s); java_candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre8/bin/javaw.exe")); java_candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre7/bin/javaw.exe")); java_candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre6/bin/javaw.exe")); java_candidates.append(JDK32s); + java_candidates.append(NEWJDK32s); java_candidates.append(MakeJavaPtr(this->GetDefaultJava()->path)); QList<QString> candidates; |