diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-04-06 10:52:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-06 10:52:15 +0200 |
| commit | a1a7b9c15171c09131ee8b8a3d9e81355728cfb1 (patch) | |
| tree | 9a1073ff0f3426335623a0639236eb6b2afe6183 /launcher/launch/steps | |
| parent | dc6340bf384d6f54f9f2793c55235b1bdd879b00 (diff) | |
| parent | cf8680f1ab3eb18da8f9f2235010065a51313061 (diff) | |
| download | PrismLauncher-a1a7b9c15171c09131ee8b8a3d9e81355728cfb1.tar.gz PrismLauncher-a1a7b9c15171c09131ee8b8a3d9e81355728cfb1.tar.bz2 PrismLauncher-a1a7b9c15171c09131ee8b8a3d9e81355728cfb1.zip | |
Merge pull request #397 from DioEgizio/manymc-detect-aarch64
Diffstat (limited to 'launcher/launch/steps')
| -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) |
