浏览代码

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.
jp9000 8 年之前
父节点
当前提交
840bd07365
共有 2 个文件被更改,包括 8 次插入0 次删除
  1. 7 0
      UI/window-basic-settings.cpp
  2. 1 0
      UI/window-basic-settings.hpp

+ 7 - 0
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)
 {

+ 1 - 0
UI/window-basic-settings.hpp

@@ -303,4 +303,5 @@ protected:
 
 public:
 	OBSBasicSettings(QWidget *parent);
+	~OBSBasicSettings();
 };