diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2021-06-30 17:25:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-30 17:25:50 +0200 |
| commit | 417994735a4823782f0f2304695347a13eed9a1d (patch) | |
| tree | 927a8e5a8d5a149cc78dbc49a07966e2c9917d2f /api/logic/java | |
| parent | dc3a4cebce489b5d61081a315311ffa3d34992ef (diff) | |
| parent | 2e78b64058925aca0c7a6e7013be7119b66f20d7 (diff) | |
| download | PrismLauncher-417994735a4823782f0f2304695347a13eed9a1d.tar.gz PrismLauncher-417994735a4823782f0f2304695347a13eed9a1d.tar.bz2 PrismLauncher-417994735a4823782f0f2304695347a13eed9a1d.zip | |
Merge pull request #3914 from jamierocks/mch-check-checksums
NOISSUE Cache modpacks.ch files and check their checksums
Diffstat (limited to 'api/logic/java')
| -rw-r--r-- | api/logic/java/JavaUtils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp index ff6a9ac5..4b231e6a 100644 --- a/api/logic/java/JavaUtils.cpp +++ b/api/logic/java/JavaUtils.cpp @@ -273,13 +273,13 @@ QList<QString> JavaUtils::FindJavaPaths() QList<JavaInstallPtr> ZULU64s = this->FindJavaFromRegistryKey( KEY_WOW64_64KEY, "SOFTWARE\\Azul Systems\\Zulu", "InstallationPath"); QList<JavaInstallPtr> ZULU32s = this->FindJavaFromRegistryKey( - KEY_WOW64_64KEY, "SOFTWARE\\Azul Systems\\Zulu", "InstallationPath"); + KEY_WOW64_32KEY, "SOFTWARE\\Azul Systems\\Zulu", "InstallationPath"); // BellSoft Liberica QList<JavaInstallPtr> LIBERICA64s = this->FindJavaFromRegistryKey( KEY_WOW64_64KEY, "SOFTWARE\\BellSoft\\Liberica", "InstallationPath"); QList<JavaInstallPtr> LIBERICA32s = this->FindJavaFromRegistryKey( - KEY_WOW64_64KEY, "SOFTWARE\\BellSoft\\Liberica", "InstallationPath"); + KEY_WOW64_32KEY, "SOFTWARE\\BellSoft\\Liberica", "InstallationPath"); // List x64 before x86 java_candidates.append(JRE64s); |