From ade054eeaadcbc29642d8fe8b609ff9ed6854e8a Mon Sep 17 00:00:00 2001 From: jp9000 Date: Wed, 11 Nov 2020 10:19:06 -0800 Subject: [PATCH] UI: Fix compiler-specific error Return value between ternary options are ambiguous on GCC/clang --- UI/window-basic-settings-stream.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp index c21aefbfb..870f946e5 100644 --- a/UI/window-basic-settings-stream.cpp +++ b/UI/window-basic-settings-stream.cpp @@ -665,7 +665,8 @@ void OBSBasicSettings::UpdateVodTrackSetting() OBSService OBSBasicSettings::GetStream1Service() { - return stream1Changed ? SpawnTempService() : main->GetService(); + return stream1Changed ? SpawnTempService() + : OBSService(main->GetService()); } void OBSBasicSettings::UpdateServiceRecommendations()