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

Merge pull request #1297 from Palakis/preview-scene-event-fix

Browse Source 
UI: Fix OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED
This commit is contained in:
Jim 2018-05-15 00:14:34 -07:00 committed by GitHub
commit f1c1abce55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -639,12 +639,11 @@ void OBSBasic::SetCurrentScene(OBSSource scene, bool force, bool direct)
ui->scenes->blockSignals(true);
ui->scenes->setCurrentItem(item);
ui->scenes->blockSignals(false);
if (api)
api->on_event(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
break;
}
}
if (api && IsPreviewProgramMode())
api->on_event(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
}
UpdateSceneSelection(scene);

12
UI/window-basic-main.cpp
View File

@ -900,8 +900,10 @@ retryScene:
disableSaving--;
if (api)
if (api) {
api->on_event(OBS_FRONTEND_EVENT_SCENE_CHANGED);
api->on_event(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
}
}
#define SERVICE_PATH "service.json"
@ -2271,6 +2273,11 @@ void OBSBasic::UpdateSceneSelection(OBSSource source)
sceneChanging = false;
UpdateSources(scene);
OBSScene curScene =
GetOBSRef<OBSScene>(ui->scenes->currentItem());
if (api && scene != curScene)
api->on_event(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
}
}
}
@ -3508,6 +3515,9 @@ void OBSBasic::on_scenes_currentItemChanged(QListWidgetItem *current,
SetCurrentScene(source);
if (api)
api->on_event(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
UNUSED_PARAMETER(prev);
}