4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Block when calling obs_frontend_set_current_scene

Browse source 
Uses WaitConnection() when calling obs_frontend_set_current_scene to
ensure that the calling thread and the UI thread are synchronized when
setting the current scene via this function.

Closes obsproject/obs-studio#1234
This commit is contained in:
Ilya Melamed 2018-05-04 15:43:03 -07:00 • committed by jp9000
commit e265fc92ed
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
UI/api-interface.cpp
View file

@ -93,9 +93,11 @@ struct OBSStudioAPI : obs_frontend_callbacks {
{
if (main->IsPreviewProgramMode()) {
QMetaObject::invokeMethod(main, "TransitionToScene",
WaitConnection(),
Q_ARG(OBSSource, OBSSource(scene)));
} else {
QMetaObject::invokeMethod(main, "SetCurrentScene",
WaitConnection(),
Q_ARG(OBSSource, OBSSource(scene)),
Q_ARG(bool, false));
}