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

UI: Don't override transition if quick transition

Browse Source 
Fixes an issue where quick transitions would not function if the scene
has a transition override set for it.
This commit is contained in:
jp9000 2017-11-30 09:46:30 -08:00
parent 6461b63623
commit ed7ae5839b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ void OBSBasic::TriggerQuickTransition(int id)
if (GetCurrentTransition() != qt->source)
SetTransition(qt->source);
TransitionToScene(source);
TransitionToScene(source, false, false, true);
}
}
@ -271,7 +271,8 @@ void OBSBasic::TransitionFullyStopped()
}
}
void OBSBasic::TransitionToScene(OBSSource source, bool force, bool direct)
void OBSBasic::TransitionToScene(OBSSource source, bool force, bool direct,
bool quickTransition)
{
obs_scene_t *scene = obs_scene_from_source(source);
bool usingPreviewProgram = IsPreviewProgramMode();
@ -319,7 +320,7 @@ void OBSBasic::TransitionToScene(OBSSource source, bool force, bool direct)
"transition");
int duration = ui->transitionDuration->value();
if (trOverrideName && *trOverrideName) {
if (trOverrideName && *trOverrideName && !quickTransition) {
OBSSource trOverride = FindTransition(trOverrideName);
if (trOverride) {
transition = trOverride;

2
UI/window-basic-main.hpp
View File

@ -395,7 +395,7 @@ public slots:
void TransitionToScene(OBSScene scene, bool force = false,
bool direct = false);
void TransitionToScene(OBSSource scene, bool force = false,
bool direct = false);
bool direct = false, bool quickTransition = false);
void SetCurrentScene(OBSSource scene, bool force = false,
bool direct = false);