From 27f913843a08f346df4b8027572e92c8a24a9dde Mon Sep 17 00:00:00 2001 From: Clayton Groeneveld Date: Sun, 23 Aug 2020 10:30:19 -0700 Subject: [PATCH] UI: Add OBSBasic::ClearProjectors() Allows the ability to clear projectors via a function rather than have to manually iterate any time one needs to clear the projectors --- UI/window-basic-main.cpp | 17 +++++++++++------ UI/window-basic-main.hpp | 1 + 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index b9fa4c52e..a2ed34ea1 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -4076,6 +4076,16 @@ void OBSBasic::EnumDialogs() } } +void OBSBasic::ClearProjectors() +{ + for (size_t i = 0; i < projectors.size(); i++) { + if (projectors[i]) + delete projectors[i]; + } + + projectors.clear(); +} + void OBSBasic::ClearSceneData() { disableSaving++; @@ -4088,12 +4098,7 @@ void OBSBasic::ClearSceneData() ClearQuickTransitions(); ui->transitions->clear(); - for (size_t i = 0; i < projectors.size(); i++) { - if (projectors[i]) - delete projectors[i]; - } - - projectors.clear(); + ClearProjectors(); obs_set_output_source(0, nullptr); obs_set_output_source(1, nullptr); diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp index 289664538..06cbdfe54 100644 --- a/UI/window-basic-main.hpp +++ b/UI/window-basic-main.hpp @@ -347,6 +347,7 @@ private: void CloseDialogs(); void ClearSceneData(); + void ClearProjectors(); void Nudge(int dist, MoveDir dir);