1
0
Эх сурвалжийг харах

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.
Ryan Foster 5 жил өмнө
parent
commit
7f4e375e12

+ 2 - 2
UI/forms/OBSBasicSettings.ui

@@ -1378,7 +1378,7 @@
                   <number>0</number>
                   <number>0</number>
                  </property>
                  </property>
                  <item>
                  <item>
-                  <widget class="QGroupBox" name="groupBox_8">
+                  <widget class="QGroupBox" name="simpleStreamingGroupBox">
                    <property name="sizePolicy">
                    <property name="sizePolicy">
                     <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
                     <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
                      <horstretch>0</horstretch>
                      <horstretch>0</horstretch>
@@ -1549,7 +1549,7 @@
                      <widget class="QComboBox" name="simpleOutStrEncoder"/>
                      <widget class="QComboBox" name="simpleOutStrEncoder"/>
                     </item>
                     </item>
                     <item row="1" column="0">
                     <item row="1" column="0">
-                     <widget class="QLabel" name="simpleOutRecEncoderLabel_2">
+                     <widget class="QLabel" name="simpleOutStrEncoderLabel">
                       <property name="text">
                       <property name="text">
                        <string>Basic.Settings.Output.Encoder</string>
                        <string>Basic.Settings.Output.Encoder</string>
                       </property>
                       </property>

+ 2 - 0
UI/window-basic-settings.cpp

@@ -2064,6 +2064,8 @@ void OBSBasicSettings::LoadOutputSettings()
 	if (obs_video_active()) {
 	if (obs_video_active()) {
 		ui->outputMode->setEnabled(false);
 		ui->outputMode->setEnabled(false);
 		ui->outputModeLabel->setEnabled(false);
 		ui->outputModeLabel->setEnabled(false);
+		ui->simpleOutStrEncoderLabel->setEnabled(false);
+		ui->simpleOutStrEncoder->setEnabled(false);
 		ui->simpleRecordingGroupBox->setEnabled(false);
 		ui->simpleRecordingGroupBox->setEnabled(false);
 		ui->replayBufferGroupBox->setEnabled(false);
 		ui->replayBufferGroupBox->setEnabled(false);
 		ui->advOutTopContainer->setEnabled(false);
 		ui->advOutTopContainer->setEnabled(false);