From 0d91fd9a8be5b393dc7784ee7d428d1347190a85 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Tue, 18 Feb 2025 17:34:05 +0100 Subject: [PATCH] frontend: Reduce SetCurrentTransition calls --- frontend/widgets/OBSBasic_Transitions.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/widgets/OBSBasic_Transitions.cpp b/frontend/widgets/OBSBasic_Transitions.cpp index 3bffc258e8f1ab..6a2b310d5a931d 100644 --- a/frontend/widgets/OBSBasic_Transitions.cpp +++ b/frontend/widgets/OBSBasic_Transitions.cpp @@ -70,7 +70,6 @@ void OBSBasic::InitDefaultTransitions() } } - /* FIXME: Reduce SetCurrentTransition calls */ for (OBSSource &tr : defaultTransitions) { std::string uuid = obs_source_get_uuid(tr); @@ -78,9 +77,9 @@ void OBSBasic::InitDefaultTransitions() transitionNameToUuids.insert({obs_source_get_name(tr), uuid}); emit TransitionAdded(QT_UTF8(obs_source_get_name(tr)), QString::fromStdString(uuid)); - - SetCurrentTransition(uuid); } + + SetCurrentTransition(transitionUuids.back()); } void OBSBasic::AddQuickTransitionHotkey(QuickTransition *qt) @@ -1350,7 +1349,6 @@ void OBSBasic::LoadTransitions(obs_data_array_t *transitionsData, obs_load_sourc size_t count = obs_data_array_count(transitionsData); safeModeTransitions.clear(); - /* FIXME: Reduce SetCurrentTransition calls */ for (size_t i = 0; i < count; i++) { OBSDataAutoRelease item = obs_data_array_item(transitionsData, i); const char *name = obs_data_get_string(item, "name"); @@ -1368,13 +1366,14 @@ void OBSBasic::LoadTransitions(obs_data_array_t *transitionsData, obs_load_sourc emit TransitionAdded(QT_UTF8(name), QString::fromStdString(uuid)); - SetCurrentTransition(uuid); if (cb) cb(private_data, source); } else if (safe_mode || disable_3p_plugins) { safeModeTransitions.push_back(std::move(item)); } } + + SetCurrentTransition(transitionUuids.back()); } OBSSource OBSBasic::GetOverrideTransition(OBSSource source)