From 4251e32366dba8ca3d05c78ba336ab821cd9d882 Mon Sep 17 00:00:00 2001 From: Exeldro Date: Tue, 6 Feb 2024 13:13:49 +0100 Subject: [PATCH] UI: Fix source remove log scene --- UI/source-tree.cpp | 8 +++++--- UI/source-tree.hpp | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/UI/source-tree.cpp b/UI/source-tree.cpp index e20d0f26c..88bbf8fae 100644 --- a/UI/source-tree.cpp +++ b/UI/source-tree.cpp @@ -205,10 +205,13 @@ void SourceTreeItem::ReconnectSignals() reinterpret_cast(data); obs_sceneitem_t *curItem = (obs_sceneitem_t *)calldata_ptr(cd, "item"); + obs_scene_t *curScene = + (obs_scene_t *)calldata_ptr(cd, "scene"); if (curItem == this_->sceneitem) { QMetaObject::invokeMethod(this_->tree, "Remove", - Q_ARG(OBSSceneItem, curItem)); + Q_ARG(OBSSceneItem, curItem), + Q_ARG(OBSScene, curScene)); curItem = nullptr; } if (!curItem) @@ -1617,14 +1620,13 @@ bool SourceTree::GroupedItemsSelected() const return false; } -void SourceTree::Remove(OBSSceneItem item) +void SourceTree::Remove(OBSSceneItem item, OBSScene scene) { OBSBasic *main = reinterpret_cast(App()->GetMainWindow()); GetStm()->Remove(item); main->SaveProject(); if (!main->SavingDisabled()) { - obs_scene_t *scene = obs_sceneitem_get_scene(item); obs_source_t *sceneSource = obs_scene_get_source(scene); obs_source_t *itemSource = obs_sceneitem_get_source(item); blog(LOG_INFO, "User Removed source '%s' (%s) from scene '%s'", diff --git a/UI/source-tree.hpp b/UI/source-tree.hpp index 901eef6e9..7ac920540 100644 --- a/UI/source-tree.hpp +++ b/UI/source-tree.hpp @@ -182,7 +182,7 @@ public: public slots: inline void ReorderItems() { GetStm()->ReorderItems(); } inline void RefreshItems() { GetStm()->SceneChanged(); } - void Remove(OBSSceneItem item); + void Remove(OBSSceneItem item, OBSScene scene); void GroupSelectedItems(); void UngroupSelectedGroups(); void AddGroup();