Ver código fonte

UI: Only allow stream/record hotkeys if the UI buttons are enabled

Currently the only thing preventing a user from trying to start multiple
streams or recordings is the UI buttons being disabled. The hotkey code
allowed the user to bypass that, which for streaming resulted in lots of
rtmp output connect threads spawning, which stomped all over each
other's data structures and resulted in crashes.
Richard Stanway 7 anos atrás
pai
commit
2d60c89a02
1 arquivos alterados com 9 adições e 5 exclusões
  1. 9 5
      UI/window-basic-main.cpp

+ 9 - 5
UI/window-basic-main.cpp

@@ -1786,7 +1786,7 @@ void OBSBasic::CreateHotkeys()
 	[](void *data, obs_hotkey_pair_id, obs_hotkey_t*, bool pressed) \
 	{ \
 		OBSBasic &basic = *static_cast<OBSBasic*>(data); \
-		if (pred && pressed) { \
+		if ((pred) && pressed) { \
 			blog(LOG_INFO, log_action " due to hotkey"); \
 			method(); \
 			return true; \
@@ -1799,9 +1799,11 @@ void OBSBasic::CreateHotkeys()
 			Str("Basic.Main.StartStreaming"),
 			"OBSBasic.StopStreaming",
 			Str("Basic.Main.StopStreaming"),
-			MAKE_CALLBACK(!basic.outputHandler->StreamingActive(),
+			MAKE_CALLBACK(!basic.outputHandler->StreamingActive() &&
+				basic.ui->streamButton->isEnabled(),
 				basic.StartStreaming, "Starting stream"),
-			MAKE_CALLBACK(basic.outputHandler->StreamingActive(),
+			MAKE_CALLBACK(basic.outputHandler->StreamingActive() &&
+				basic.ui->streamButton->isEnabled(),
 				basic.StopStreaming, "Stopping stream"),
 			this, this);
 	LoadHotkeyPair(streamingHotkeys,
@@ -1827,9 +1829,11 @@ void OBSBasic::CreateHotkeys()
 			Str("Basic.Main.StartRecording"),
 			"OBSBasic.StopRecording",
 			Str("Basic.Main.StopRecording"),
-			MAKE_CALLBACK(!basic.outputHandler->RecordingActive(),
+			MAKE_CALLBACK(!basic.outputHandler->RecordingActive() &&
+				!basic.ui->recordButton->isChecked(),
 				basic.StartRecording, "Starting recording"),
-			MAKE_CALLBACK(basic.outputHandler->RecordingActive(),
+			MAKE_CALLBACK(basic.outputHandler->RecordingActive() &&
+				basic.ui->recordButton->isChecked(),
 				basic.StopRecording, "Stopping recording"),
 			this, this);
 	LoadHotkeyPair(recordingHotkeys,