From feae420450d92733f237d32dca9303ff51fe0525 Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Mon, 7 Sep 2020 22:28:41 +0200
Subject: NOISSUE add 'java.vendor' to the checker and display/log the value

---
 application/JavaCommon.cpp | 3 ++-
 application/MultiMC.cpp    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'application')

diff --git a/application/JavaCommon.cpp b/application/JavaCommon.cpp
index 563dfb35..92a058f0 100644
--- a/application/JavaCommon.cpp
+++ b/application/JavaCommon.cpp
@@ -24,7 +24,8 @@ void JavaCommon::javaWasOk(QWidget *parent, JavaCheckResult result)
 {
     QString text;
     text += QObject::tr("Java test succeeded!<br />Platform reported: %1<br />Java version "
-        "reported: %2<br />").arg(result.realPlatform, result.javaVersion.toString());
+        "reported: %2<br />Java vendor "
+        "reported: %3<br />").arg(result.realPlatform, result.javaVersion.toString(), result.javaVendor);
     if (result.errorLog.size())
     {
         auto htmlError = result.errorLog;
diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp
index eeab500e..8e2557d4 100644
--- a/application/MultiMC.cpp
+++ b/application/MultiMC.cpp
@@ -505,6 +505,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
         m_settings->registerSetting("JavaTimestamp", 0);
         m_settings->registerSetting("JavaArchitecture", "");
         m_settings->registerSetting("JavaVersion", "");
+        m_settings->registerSetting("JavaVendor", "");
         m_settings->registerSetting("LastHostname", "");
         m_settings->registerSetting("JvmArgs", "");
 
-- 
cgit