From 840bd073651a703f28c7af8a4482cd8e2840f683 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Mon, 15 May 2017 14:26:05 -0700 Subject: [PATCH] UI: Prevent user from starting ouputs while in settings There's a loophole that would allow users to activate an output while in the settings window via hotkeys -- this prevents that from being able to happen. Note that users can still shut down outputs, but they can no longer start them up while in the settings window. --- UI/window-basic-settings.cpp | 7 +++++++ UI/window-basic-settings.hpp | 1 + 2 files changed, 8 insertions(+) diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index dcd671355..52f10b9b8 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -277,6 +277,8 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent) ui->setupUi(this); + main->EnableOutputs(false); + PopulateAACBitrates({ui->simpleOutputABitrate, ui->advOutTrack1Bitrate, ui->advOutTrack2Bitrate, ui->advOutTrack3Bitrate, ui->advOutTrack4Bitrate, @@ -654,6 +656,11 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent) UpdateAutomaticReplayBufferCheckboxes(); } +OBSBasicSettings::~OBSBasicSettings() +{ + main->EnableOutputs(true); +} + void OBSBasicSettings::SaveCombo(QComboBox *widget, const char *section, const char *value) { diff --git a/UI/window-basic-settings.hpp b/UI/window-basic-settings.hpp index 6440322e2..5e56ec75c 100644 --- a/UI/window-basic-settings.hpp +++ b/UI/window-basic-settings.hpp @@ -303,4 +303,5 @@ protected: public: OBSBasicSettings(QWidget *parent); + ~OBSBasicSettings(); };