From 42323ea31b87c0df1a3d428a9d1ccf890f34f6c0 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Thu, 30 Nov 2017 09:49:02 -0800 Subject: [PATCH] UI: Fix scene override when switching off studio mode The scene override would trigger, but the scene override variable would stay set, causing the next transition to be the same one that was previously used for overriding. --- UI/window-basic-main-transitions.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/UI/window-basic-main-transitions.cpp b/UI/window-basic-main-transitions.cpp index e305a08f1..512314454 100644 --- a/UI/window-basic-main-transitions.cpp +++ b/UI/window-basic-main-transitions.cpp @@ -335,8 +335,10 @@ void OBSBasic::TransitionToScene(OBSSource source, bool force, bool direct, } } - obs_transition_start(transition, OBS_TRANSITION_MODE_AUTO, - duration, source); + bool success = obs_transition_start(transition, + OBS_TRANSITION_MODE_AUTO, duration, source); + if (!success) + TransitionFullyStopped(); } if (usingPreviewProgram && sceneDuplicationMode && !direct) @@ -1164,7 +1166,7 @@ void OBSBasic::SetPreviewProgramMode(bool enabled) if (!actualProgramScene) actualProgramScene = GetCurrentSceneSource(); else - SetCurrentScene(actualProgramScene); + SetCurrentScene(actualProgramScene, true); TransitionToScene(actualProgramScene, true); delete programOptions;