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 /application | |
| parent | 8a0027c73a755849bf5b58c1509c71a543ddb982 (diff) | |
| download | PrismLauncher-feae420450d92733f237d32dca9303ff51fe0525.tar.gz PrismLauncher-feae420450d92733f237d32dca9303ff51fe0525.tar.bz2 PrismLauncher-feae420450d92733f237d32dca9303ff51fe0525.zip | |
NOISSUE add 'java.vendor' to the checker and display/log the value
Diffstat (limited to 'application')
| -rw-r--r-- | application/JavaCommon.cpp | 3 | ||||
| -rw-r--r-- | application/MultiMC.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
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", ""); |