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/launch | |
parent | 115d8b594509501158874205e657987883ebf8f4 (diff) | |
download | PrismLauncher-cf8680f1ab3eb18da8f9f2235010065a51313061.tar.gz PrismLauncher-cf8680f1ab3eb18da8f9f2235010065a51313061.tar.bz2 PrismLauncher-cf8680f1ab3eb18da8f9f2235010065a51313061.zip |
fix: properly detect arm64
Diffstat (limited to 'launcher/launch')
-rw-r--r-- | launcher/launch/steps/CheckJava.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/launcher/launch/steps/CheckJava.cpp b/launcher/launch/steps/CheckJava.cpp index c2ebb334..3226fae7 100644 --- a/launcher/launch/steps/CheckJava.cpp +++ b/launcher/launch/steps/CheckJava.cpp @@ -124,7 +124,8 @@ void CheckJava::checkJavaFinished(JavaCheckResult result) case JavaCheckResult::Validity::Valid: { auto instance = m_parent->instance(); - printJavaInfo(result.javaVersion.toString(), result.mojangPlatform, result.javaVendor); + printJavaInfo(result.javaVersion.toString(), result.realPlatform, result.javaVendor); + printSystemInfo(true, result.is_64bit); instance->settings()->set("JavaVersion", result.javaVersion.toString()); instance->settings()->set("JavaArchitecture", result.mojangPlatform); instance->settings()->set("JavaVendor", result.javaVendor); @@ -137,8 +138,7 @@ void CheckJava::checkJavaFinished(JavaCheckResult result) void CheckJava::printJavaInfo(const QString& version, const QString& architecture, const QString & vendor) { - emit logLine(QString("Java is version %1, using %2-bit architecture, from %3.\n\n").arg(version, architecture, vendor), MessageLevel::Launcher); - printSystemInfo(true, architecture == "64"); + emit logLine(QString("Java is version %1, using %2 architecture, from %3.\n\n").arg(version, architecture, vendor), MessageLevel::Launcher); } void CheckJava::printSystemInfo(bool javaIsKnown, bool javaIs64bit) |