fixed issue: fullscreen check prevented switch to backup scene

This commit is contained in:
WarmUpTill 2016-10-06 14:37:29 +02:00 committed by GitHub
parent eda80978c9
commit 6b58dfb804

View File

@ -1069,6 +1069,7 @@ void SwitcherData::Thread()
if (currentSource == currentSource2){
obs_frontend_set_current_scene(source);
obs_source_release(source);
obs_source_release(currentSource2);
obs_weak_source_release(ws);
break;
}
@ -1142,14 +1143,14 @@ void SwitcherData::Thread()
}
}
match = match && (!fullscreen || (fullscreen && isFullscreen()));
if (!match && switchIfNotMatching &&
nonMatchingScene && !ignoreWindow) {
match = true;
scene = nonMatchingScene;
}
match = match && (!fullscreen || (fullscreen && isFullscreen()));
if (match) {
obs_source_t *source =
obs_weak_source_get_source(scene);