From 8743e722aed46131943aed22496e3c28ade6b55f Mon Sep 17 00:00:00 2001
From: kc5nra <jrb@turrettech.com>
Date: Sat, 28 Mar 2015 01:01:55 -0500
Subject: [PATCH] UI: Properly disable when scale disabled

Enable/Disable scale output ComboBox based on whether
the scale checkbox is selected.
---
 obs/window-basic-settings.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/obs/window-basic-settings.cpp b/obs/window-basic-settings.cpp
index 043866cca..b9abc6dac 100644
--- a/obs/window-basic-settings.cpp
+++ b/obs/window-basic-settings.cpp
@@ -686,6 +686,7 @@ void OBSBasicSettings::LoadAdvOutputStreamingSettings()
 	ui->advOutMaxRetries->setValue(maxRetries);
 	ui->advOutApplyService->setChecked(applyServiceSettings);
 	ui->advOutUseRescale->setChecked(rescale);
+	ui->advOutRescale->setEnabled(rescale);
 	ui->advOutRescale->setCurrentText(rescaleRes);
 
 	switch (trackIndex) {
@@ -807,6 +808,7 @@ void OBSBasicSettings::LoadAdvOutputFFmpegSettings()
 	ui->advOutFFURL->setText(url);
 	ui->advOutFFVBitrate->setValue(videoBitrate);
 	ui->advOutFFUseRescale->setChecked(rescale);
+	ui->advOutFFRescale->setEnabled(rescale);
 	ui->advOutFFRescale->setCurrentText(rescaleRes);
 	ui->advOutFFVEncoder->setText(vEncoder);
 	ui->advOutFFVCfg->setText(vEncCustom);