jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Fix scene override when switching off studio mode

Browse Source 
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.
This commit is contained in:
jp9000 2017-11-30 09:49:02 -08:00
parent ed7ae5839b
commit 42323ea31b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UI/window-basic-main-transitions.cpp
View File

@ -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;