From b4443ea5efd29ea420d7d64e573c6c42f36d75f8 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Tue, 25 Aug 2020 00:39:45 -0700 Subject: [PATCH] UI: Remove null source warnings --- UI/window-basic-main-transitions.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/UI/window-basic-main-transitions.cpp b/UI/window-basic-main-transitions.cpp index 12ed324df..dd03a9298 100644 --- a/UI/window-basic-main-transitions.cpp +++ b/UI/window-basic-main-transitions.cpp @@ -254,6 +254,8 @@ obs_source_t *OBSBasic::FindTransition(const char *name) { for (int i = 0; i < ui->transitions->count(); i++) { OBSSource tr = ui->transitions->itemData(i).value(); + if (!tr) + continue; const char *trName = obs_source_get_name(tr); if (trName && *trName && strcmp(trName, name) == 0) @@ -706,10 +708,12 @@ void OBSBasic::SetCurrentScene(OBSSource scene, bool force) UpdateSceneSelection(scene); - bool userSwitched = (!force && !disableSaving); - blog(LOG_INFO, "%s to scene '%s'", - userSwitched ? "User switched" : "Switched", - obs_source_get_name(scene)); + if (scene) { + bool userSwitched = (!force && !disableSaving); + blog(LOG_INFO, "%s to scene '%s'", + userSwitched ? "User switched" : "Switched", + obs_source_get_name(scene)); + } } void OBSBasic::CreateProgramDisplay() @@ -1499,7 +1503,7 @@ obs_data_array_t *OBSBasic::SaveTransitions() for (int i = 0; i < ui->transitions->count(); i++) { OBSSource tr = ui->transitions->itemData(i).value(); - if (!obs_source_configurable(tr)) + if (!tr || !obs_source_configurable(tr)) continue; obs_data_t *sourceData = obs_data_create();