mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-07 03:53:38 +00:00
UI: Fix OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED
OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED is supposed to be called whenever the user changes the current preview scene -- it was almost never being triggered.
This commit is contained in:
parent
57121478ac
commit
f81d106b2a
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue