From 112adb0a73c968658336a23d8dac1d02c82f6892 Mon Sep 17 00:00:00 2001
From: Lain <lain@obsproject.com>
Date: Thu, 31 Aug 2023 23:39:26 -0700
Subject: [PATCH] UI: Fix stream key UI not showing when using stream key

In the settings window, when the user chooses to use a stream key
instead of connecting their account, it switches widgets to show the
stream key UI. However, when opening the settings window again after
having done that, it's supposed to continue to show the stream key UI,
and that functionality was broken by obsproject/obs-studio#9272. It did
this because OBSBasicSettings::ServiceChanged() no longer called
reset_service_ui_fields() because the lastService member variable was no
longer set to empty in OBSBasicSettings::LoadStream1Settings().

This fixes it by just adding a parameter to
OBSBasicSettings::ServiceChanged() to make it forcibly reset the fields
when loading stream settings.
---
 UI/window-basic-settings-stream.cpp | 6 +++---
 UI/window-basic-settings.hpp        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp
index ea0424f7e..2ad275a44 100644
--- a/UI/window-basic-settings-stream.cpp
+++ b/UI/window-basic-settings-stream.cpp
@@ -162,7 +162,7 @@ void OBSBasicSettings::LoadStream1Settings()
 	else
 		ui->key->setText(key);
 
-	ServiceChanged();
+	ServiceChanged(true);
 
 	UpdateKeyLink();
 	UpdateMoreInfoLink();
@@ -520,7 +520,7 @@ void OBSBasicSettings::on_customServer_textChanged(const QString &)
 		lastCustomServer = ui->customServer->text();
 }
 
-void OBSBasicSettings::ServiceChanged()
+void OBSBasicSettings::ServiceChanged(bool resetFields)
 {
 	std::string service = QT_TO_UTF8(ui->service->currentText());
 	bool custom = IsCustomService();
@@ -531,7 +531,7 @@ void OBSBasicSettings::ServiceChanged()
 	ui->twitchAddonDropdown->setVisible(false);
 	ui->twitchAddonLabel->setVisible(false);
 
-	if (lastService != service.c_str()) {
+	if (resetFields || lastService != service.c_str()) {
 		reset_service_ui_fields(ui.get(), service, loading);
 	}
 
diff --git a/UI/window-basic-settings.hpp b/UI/window-basic-settings.hpp
index 9f3f85a3b..b874c0b85 100644
--- a/UI/window-basic-settings.hpp
+++ b/UI/window-basic-settings.hpp
@@ -261,7 +261,7 @@ private:
 	int prevLangIndex;
 	bool prevBrowserAccel;
 
-	void ServiceChanged();
+	void ServiceChanged(bool resetFields = false);
 	QString FindProtocol();
 	void UpdateServerList();
 	void UpdateKeyLink();