OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-06-30 08:33:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Add null checks before doing some API calls

Browse source 
Harmless, but generated a debug warning for null pointers passed into
the API.
This commit is contained in:
Richard Stanway 2024-06-08 17:44:29 +02:00 committed by Ryan Foster
parent 51e3bd5e3d
commit f9f4171d56
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
UI/window-basic-main-transitions.cpp
View file

@ -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);

2
UI/window-basic-main.cpp
View file

@ -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);

2
UI/window-basic-preview.cpp
View file

@ -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;
}