From f9f4171d56022a3cf74f554802d84960adf78e02 Mon Sep 17 00:00:00 2001 From: Richard Stanway Date: Sat, 8 Jun 2024 17:44:29 +0200 Subject: [PATCH] UI: Add null checks before doing some API calls Harmless, but generated a debug warning for null pointers passed into the API. --- UI/window-basic-main-transitions.cpp | 3 ++- UI/window-basic-main.cpp | 2 +- UI/window-basic-preview.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/UI/window-basic-main-transitions.cpp b/UI/window-basic-main-transitions.cpp index 60d194320..2894c6387 100644 --- a/UI/window-basic-main-transitions.cpp +++ b/UI/window-basic-main-transitions.cpp @@ -445,7 +445,8 @@ void OBSBasic::SetTransition(OBSSource transition) ui->transitionDurationLabel->setVisible(!fixed); ui->transitionDuration->setVisible(!fixed); - bool configurable = obs_source_configurable(transition); + bool configurable = transition ? obs_source_configurable(transition) + : false; ui->transitionRemove->setEnabled(configurable); ui->transitionProps->setEnabled(configurable); diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index a931db27a..220bed162 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -8639,7 +8639,7 @@ void OBSBasic::UpdateEditMenu() const bool canTransformSingle = videoCount == 1 && totalCount == 1; OBSSceneItem curItem = GetCurrentSceneItem(); - bool locked = obs_sceneitem_locked(curItem); + bool locked = curItem && obs_sceneitem_locked(curItem); ui->actionCopySource->setEnabled(totalCount > 0); ui->actionEditTransform->setEnabled(canTransformSingle && !locked); diff --git a/UI/window-basic-preview.cpp b/UI/window-basic-preview.cpp index 042dd458a..848ce2ad8 100644 --- a/UI/window-basic-preview.cpp +++ b/UI/window-basic-preview.cpp @@ -654,7 +654,7 @@ void OBSBasicPreview::mousePressEvent(QMouseEvent *event) void OBSBasicPreview::UpdateCursor(uint32_t &flags) { - if (obs_sceneitem_locked(stretchItem)) { + if (!stretchItem || obs_sceneitem_locked(stretchItem)) { unsetCursor(); return; }