From a071c03470281dad61e862cfc6cc54036b30e4b2 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Thu, 4 Feb 2016 10:11:50 -0800 Subject: [PATCH] UI: Fix studio mode always duplicating scene If scene duplication mode is disabled and studio mode is turned on, it would always initially duplicate scene regardless of whether scene duplication mode was activated or not. --- obs/window-basic-main-transitions.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/obs/window-basic-main-transitions.cpp b/obs/window-basic-main-transitions.cpp index e230fab60..3d5f86d26 100644 --- a/obs/window-basic-main-transitions.cpp +++ b/obs/window-basic-main-transitions.cpp @@ -755,10 +755,16 @@ void OBSBasic::SetPreviewProgramMode(bool enabled) OBSScene curScene = GetCurrentScene(); - obs_scene_t *dup = obs_scene_duplicate(curScene, nullptr, - editPropertiesMode ? - OBS_SCENE_DUP_PRIVATE_COPY : - OBS_SCENE_DUP_PRIVATE_REFS); + obs_scene_t *dup; + if (sceneDuplicationMode) { + dup = obs_scene_duplicate(curScene, nullptr, + editPropertiesMode ? + OBS_SCENE_DUP_PRIVATE_COPY : + OBS_SCENE_DUP_PRIVATE_REFS); + } else { + dup = curScene; + obs_scene_addref(dup); + } obs_source_t *transition = obs_get_output_source(0); obs_source_t *dup_source = obs_scene_get_source(dup);