From 50d98dceacc256945d58ef31c1aafea0853384b1 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sat, 9 Jul 2016 06:31:34 -0700 Subject: [PATCH] UI: Don't do scene check when removing scene items The scene check prevents the ability to remove scene items that have been detached from their scene, which can happen when scenes are used as scene items and the scene is deleted elsewhere. --- obs/window-basic-main.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/obs/window-basic-main.cpp b/obs/window-basic-main.cpp index 48798bc7d..558994459 100644 --- a/obs/window-basic-main.cpp +++ b/obs/window-basic-main.cpp @@ -1653,16 +1653,12 @@ void OBSBasic::AddSceneItem(OBSSceneItem item) void OBSBasic::RemoveSceneItem(OBSSceneItem item) { - obs_scene_t *scene = obs_sceneitem_get_scene(item); + for (int i = 0; i < ui->sources->count(); i++) { + QListWidgetItem *listItem = ui->sources->item(i); - if (GetCurrentScene() == scene) { - for (int i = 0; i < ui->sources->count(); i++) { - QListWidgetItem *listItem = ui->sources->item(i); - - if (GetOBSRef(listItem) == item) { - DeleteListItem(ui->sources, listItem); - break; - } + if (GetOBSRef(listItem) == item) { + DeleteListItem(ui->sources, listItem); + break; } }