From 31e0c07bf7bfb36207c5ad6d1cb7c56fd192dc59 Mon Sep 17 00:00:00 2001 From: TheKodeToad Date: Thu, 21 Aug 2025 12:45:48 +0100 Subject: [PATCH] Fix #4083 - server address text box is enabled even if auto-join is disabled Signed-off-by: TheKodeToad --- launcher/ui/widgets/MinecraftSettingsWidget.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/launcher/ui/widgets/MinecraftSettingsWidget.cpp b/launcher/ui/widgets/MinecraftSettingsWidget.cpp index f46786518..7cd84c8bb 100644 --- a/launcher/ui/widgets/MinecraftSettingsWidget.cpp +++ b/launcher/ui/widgets/MinecraftSettingsWidget.cpp @@ -222,9 +222,9 @@ void MinecraftSettingsWidget::loadSettings() m_ui->useDiscreteGpuCheck->setChecked(settings->get("UseDiscreteGpu").toBool()); m_ui->useZink->setChecked(settings->get("UseZink").toBool()); - m_ui->serverJoinGroupBox->setChecked(settings->get("JoinServerOnLaunch").toBool()); - if (m_instance != nullptr) { + m_ui->serverJoinGroupBox->setChecked(settings->get("JoinServerOnLaunch").toBool()); + if (auto server = settings->get("JoinServerOnLaunchAddress").toString(); !server.isEmpty()) { m_ui->serverJoinAddress->setText(server); m_ui->serverJoinAddressButton->setChecked(true); @@ -240,7 +240,7 @@ void MinecraftSettingsWidget::loadSettings() } else { m_ui->serverJoinAddressButton->setChecked(true); m_ui->worldJoinButton->setChecked(false); - m_ui->serverJoinAddress->setEnabled(true); + m_ui->serverJoinAddress->setEnabled(m_ui->serverJoinGroupBox->isChecked()); m_ui->worldsCb->setEnabled(false); }