ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

[Backport release-9.x] make sure if user changes java path also disable java management (#3426)

Browse Source
This commit is contained in:
Alexandru Ionut Tripon 2025-02-17 20:32:54 +02:00 committed by GitHub
commit 748b92571c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
launcher/ui/pages/instance/InstanceSettingsPage.cpp
View File

@ -93,6 +93,11 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance* inst, QWidget* parent)
ui->serverJoinAddress->setEnabled(true); ui->serverJoinAddress->setEnabled(true);
ui->serverJoinAddressButton->setStyleSheet("QRadioButton::indicator { width: 0px; height: 0px; }"); ui->serverJoinAddressButton->setStyleSheet("QRadioButton::indicator { width: 0px; height: 0px; }");
} }
connect(ui->javaPathTextBox, &QLineEdit::textChanged, [this](QString newValue) {
if (m_instance->settings()->get("JavaPath").toString() != newValue) {
m_instance->settings()->set("AutomaticJava", false);
}
});
loadSettings(); loadSettings();

5
launcher/ui/widgets/JavaSettingsWidget.cpp
View File

@ -171,11 +171,6 @@ void JavaSettingsWidget::setupUi()
m_verticalLayout->addSpacerItem(m_verticalSpacer); m_verticalLayout->addSpacerItem(m_verticalSpacer);
} }
}); });
connect(m_ui->javaPathTextBox, &QLineEdit::textChanged, [this](QString newValue) {
if (m_instance->settings()->get("JavaPath").toString() != newValue) {
m_instance->settings()->set("AutomaticJava", false);
}
});
} }
m_verticalLayout->addWidget(m_autoJavaGroupBox); m_verticalLayout->addWidget(m_autoJavaGroupBox);