From 005863a34682b0687be772796355cc0d564f2656 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Wed, 11 Nov 2020 09:46:52 -0800
Subject: [PATCH] UI: Refactor to make it easier to get service object

Refactors a bit of code to make it easier to get the current stream
service object in the settings
---
 UI/window-basic-settings-stream.cpp | 5 +++++
 UI/window-basic-settings.cpp        | 8 +-------
 UI/window-basic-settings.hpp        | 2 ++
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp
index 071b03d96..7a3b84976 100644
--- a/UI/window-basic-settings-stream.cpp
+++ b/UI/window-basic-settings-stream.cpp
@@ -650,3 +650,8 @@ void OBSBasicSettings::UpdateVodTrackSetting()
 		vodTrack[i]->setChecked((i + 1) == trackIndex);
 	}
 }
+
+OBSService OBSBasicSettings::GetStream1Service()
+{
+	return stream1Changed ? SpawnTempService() : main->GetService();
+}
diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp
index 6c2c4290f..884e9bb1b 100644
--- a/UI/window-basic-settings.cpp
+++ b/UI/window-basic-settings.cpp
@@ -4604,13 +4604,7 @@ void OBSBasicSettings::SimpleRecordingEncoderChanged()
 	QString warning;
 	bool advanced = ui->simpleOutAdvanced->isChecked();
 	bool enforceBitrate = ui->simpleOutEnforce->isChecked() || !advanced;
-	OBSService service;
-
-	if (stream1Changed) {
-		service = SpawnTempService();
-	} else {
-		service = main->GetService();
-	}
+	OBSService service = GetStream1Service();
 
 	delete simpleOutRecWarning;
 
diff --git a/UI/window-basic-settings.hpp b/UI/window-basic-settings.hpp
index a8f098086..5095e3b2b 100644
--- a/UI/window-basic-settings.hpp
+++ b/UI/window-basic-settings.hpp
@@ -316,6 +316,8 @@ private:
 
 	int CurrentFLVTrack();
 
+	OBSService GetStream1Service();
+
 private slots:
 	void on_theme_activated(int idx);