From 7f4e375e12baafa19513c535f8c2df1954fb2e62 Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Sat, 31 Oct 2020 02:57:38 -0400 Subject: [PATCH] UI: Disable stream encoder setting in simple output with active output We disable the stream encoder setting in Advanced Output Mode when an output is active, so let's also disable the stream encoder setting in Simple Output Mode when an output is active. --- UI/forms/OBSBasicSettings.ui | 4 ++-- UI/window-basic-settings.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/UI/forms/OBSBasicSettings.ui b/UI/forms/OBSBasicSettings.ui index f2b91fc4c..49ae397ee 100644 --- a/UI/forms/OBSBasicSettings.ui +++ b/UI/forms/OBSBasicSettings.ui @@ -1378,7 +1378,7 @@ 0 - + 0 @@ -1549,7 +1549,7 @@ - + Basic.Settings.Output.Encoder diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index 80ed5144b..3a3890739 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -2064,6 +2064,8 @@ void OBSBasicSettings::LoadOutputSettings() if (obs_video_active()) { ui->outputMode->setEnabled(false); ui->outputModeLabel->setEnabled(false); + ui->simpleOutStrEncoderLabel->setEnabled(false); + ui->simpleOutStrEncoder->setEnabled(false); ui->simpleRecordingGroupBox->setEnabled(false); ui->replayBufferGroupBox->setEnabled(false); ui->advOutTopContainer->setEnabled(false);