Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-05-09 04:32:13 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge d2e7605e5c into 873e073eb6

Browse Source
This commit is contained in:
WarmUpTill 2026-05-08 19:09:21 +00:00 committed by GitHub
commit 234e7202ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/base/macro-condition-transition.cpp
View File

@ -158,8 +158,21 @@ void MacroConditionTransition::TransitionStarted(void *data, calldata_t *cd)
OBSSourceAutoRelease startSource = obs_transition_get_source(
transitionSource, OBS_TRANSITION_SOURCE_A);
// In studio mode, source A may be a private copy of the scene.
// Look up the original by name to get a comparable reference.
const bool studioModeActive =
obs_frontend_preview_program_mode_active();
if (studioModeActive) {
OBSSourceAutoRelease startSourceByName = obs_get_source_by_name(
obs_source_get_name(startSource));
if (startSourceByName) {
startSource = std::move(startSourceByName);
}
}
OBSSourceAutoRelease endSource =
obs_frontend_preview_program_mode_active()
studioModeActive
? obs_frontend_get_current_scene()
: obs_transition_get_source(transitionSource,
OBS_TRANSITION_SOURCE_B);
@ -357,6 +370,7 @@ void MacroConditionTransitionEdit::SceneChanged(const SceneSelection &s)
{
GUARD_LOADING_AND_LOCK();
_entryData->_scene = s;
_entryData->ConnectToTransitionSignals();
}
void MacroConditionTransitionEdit::DurationChanged(const Duration &dur)