diff options
| author | Victor <virb3e@gmail.com> | 2022-02-19 15:47:34 +0000 |
|---|---|---|
| committer | DioEgizio <83089242+DioEgizio@users.noreply.github.com> | 2022-04-04 16:41:23 +0200 |
| commit | cf8680f1ab3eb18da8f9f2235010065a51313061 (patch) | |
| tree | 48ba0a595c56a658a5eae3b5e186d1dd822b90f1 /launcher/java | |
| parent | 115d8b594509501158874205e657987883ebf8f4 (diff) | |
| download | PrismLauncher-cf8680f1ab3eb18da8f9f2235010065a51313061.tar.gz PrismLauncher-cf8680f1ab3eb18da8f9f2235010065a51313061.tar.bz2 PrismLauncher-cf8680f1ab3eb18da8f9f2235010065a51313061.zip | |
fix: properly detect arm64
Diffstat (limited to 'launcher/java')
| -rw-r--r-- | launcher/java/JavaChecker.cpp | 2 | ||||
| -rw-r--r-- | launcher/java/JavaInstallList.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/launcher/java/JavaChecker.cpp b/launcher/java/JavaChecker.cpp index 35ddc35c..946599c5 100644 --- a/launcher/java/JavaChecker.cpp +++ b/launcher/java/JavaChecker.cpp @@ -129,7 +129,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status) auto os_arch = results["os.arch"]; auto java_version = results["java.version"]; auto java_vendor = results["java.vendor"]; - bool is_64 = os_arch == "x86_64" || os_arch == "amd64"; + bool is_64 = os_arch == "x86_64" || os_arch == "amd64" || os_arch == "aarch64" || os_arch == "arm64"; result.validity = JavaCheckResult::Validity::Valid; diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp index a0a60871..9b745095 100644 --- a/launcher/java/JavaInstallList.cpp +++ b/launcher/java/JavaInstallList.cpp @@ -183,7 +183,7 @@ void JavaListLoadTask::javaCheckerFinished() JavaInstallPtr javaVersion(new JavaInstall()); javaVersion->id = result.javaVersion; - javaVersion->arch = result.mojangPlatform; + javaVersion->arch = result.realPlatform; javaVersion->path = result.path; candidates.append(javaVersion); |