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.
This commit is contained in:
parent
ed7ae5839b
commit
42323ea31b
1 changed files with 5 additions and 3 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue