diff options
author | Petr Mrázek <peterix@gmail.com> | 2020-09-07 22:28:41 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2020-09-07 22:28:41 +0200 |
commit | feae420450d92733f237d32dca9303ff51fe0525 (patch) | |
tree | ad71311f944c0a7f61caa25156f41078598f5f3f /api/logic/java/JavaChecker.cpp | |
parent | 8a0027c73a755849bf5b58c1509c71a543ddb982 (diff) | |
download | MultiMC-feae420450d92733f237d32dca9303ff51fe0525.tar MultiMC-feae420450d92733f237d32dca9303ff51fe0525.tar.gz MultiMC-feae420450d92733f237d32dca9303ff51fe0525.tar.lz MultiMC-feae420450d92733f237d32dca9303ff51fe0525.tar.xz MultiMC-feae420450d92733f237d32dca9303ff51fe0525.zip |
NOISSUE add 'java.vendor' to the checker and display/log the value
Diffstat (limited to 'api/logic/java/JavaChecker.cpp')
-rw-r--r-- | api/logic/java/JavaChecker.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/api/logic/java/JavaChecker.cpp b/api/logic/java/JavaChecker.cpp index ca0f4bde..d78d6505 100644 --- a/api/logic/java/JavaChecker.cpp +++ b/api/logic/java/JavaChecker.cpp @@ -115,7 +115,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status) } } - if(!results.contains("os.arch") || !results.contains("java.version") || !success) + if(!results.contains("os.arch") || !results.contains("java.version") || !results.contains("java.vendor") || !success) { result.validity = JavaCheckResult::Validity::ReturnedInvalidData; emit checkFinished(result); @@ -124,6 +124,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"; @@ -132,6 +133,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status) result.mojangPlatform = is_64 ? "64" : "32"; result.realPlatform = os_arch; result.javaVersion = java_version; + result.javaVendor = java_vendor; qDebug() << "Java checker succeeded."; emit checkFinished(result); } |