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

Revert "UI: Fix spamming of log when setting current scene" 

This reverts commit 9ca7e1cb0f.

Fixes obsproject/obs-studio#4801
master
jp9000 2021-06-04 18:56:28 -07:00
parent 38bb4dcc99
commit 5b25dec714
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -729,10 +729,11 @@ void OBSBasic::SetCurrentScene(OBSSource scene, bool force)
obs_source_inc_showing(scene);
if (actualLastScene)
obs_source_dec_showing(actualLastScene);
lastScene = OBSGetWeakRef(scene);
}
}
if (OBSGetStrongRef(lastScene) != scene) {
if (obs_scene_get_source(GetCurrentScene()) != scene) {
for (int i = 0; i < ui->scenes->count(); i++) {
QListWidgetItem *item = ui->scenes->item(i);
OBSScene itemScene = GetOBSRef<OBSScene>(item);
@ -748,16 +749,16 @@ void OBSBasic::SetCurrentScene(OBSSource scene, bool force)
break;
}
}
}
lastScene = OBSGetWeakRef(scene);
UpdateContextBar(true);
if (scene) {
bool userSwitched = (!force && !disableSaving);
blog(LOG_INFO, "%s to scene '%s'",
userSwitched ? "User switched" : "Switched",
obs_source_get_name(scene));
}
UpdateContextBar(true);
}
void OBSBasic::CreateProgramDisplay()
@ -1685,6 +1686,7 @@ void OBSBasic::SetPreviewProgramMode(bool enabled)
OBSSource actualLastScene = OBSGetStrongRef(lastScene);
if (actualLastScene)
obs_source_dec_showing(actualLastScene);
lastScene = nullptr;
}
programScene = nullptr;