aboutsummaryrefslogtreecommitdiff
path: root/launcher/ui/pages/instance/InstanceSettingsPage.cpp
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-03-24 14:47:22 +0100
committerSefa Eyeoglu <contact@scrumplex.net>2022-03-24 16:10:39 +0100
commit82c35f27464e3fd0d0aaa4f9e495e895f8534799 (patch)
treee162e482fb47d149629f91a0d27b6f99f4c62c7a /launcher/ui/pages/instance/InstanceSettingsPage.cpp
parentc7fdfb811669a863606dc0a26186c0ab827db9c6 (diff)
downloadPrismLauncher-82c35f27464e3fd0d0aaa4f9e495e895f8534799.tar.gz
PrismLauncher-82c35f27464e3fd0d0aaa4f9e495e895f8534799.tar.bz2
PrismLauncher-82c35f27464e3fd0d0aaa4f9e495e895f8534799.zip
feat: block launch if Java is incompatible
Keep track of compatible Java versions from meta. Launch-step VerifyJavaInstall will check if current instance's Java version is compatible. Also add override option both globally and per-instance in-case the user doesn't care about the requirement.
Diffstat (limited to 'launcher/ui/pages/instance/InstanceSettingsPage.cpp')
-rw-r--r--launcher/ui/pages/instance/InstanceSettingsPage.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index e68a7124..a5985741 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -165,10 +165,12 @@ void InstanceSettingsPage::applySettings()
if (javaInstall)
{
m_settings->set("JavaPath", ui->javaPathTextBox->text());
+ m_settings->set("IgnoreJavaCompatibility", ui->skipCompatibilityCheckbox->isChecked());
}
else
{
m_settings->reset("JavaPath");
+ m_settings->reset("IgnoreJavaCompatibility");
}
// Java arguments
@@ -286,6 +288,7 @@ void InstanceSettingsPage::loadSettings()
ui->javaSettingsGroupBox->setChecked(overrideLocation);
ui->javaPathTextBox->setText(m_settings->get("JavaPath").toString());
+ ui->skipCompatibilityCheckbox->setChecked(m_settings->get("IgnoreJavaCompatibility").toBool());
ui->javaArgumentsGroupBox->setChecked(overrideArgs);
ui->jvmArgsTextBox->setPlainText(m_settings->get("JvmArgs").toString());