@@ -70,17 +70,16 @@ void OBSBasic::InitDefaultTransitions()
7070 }
7171 }
7272
73- /* FIXME: Reduce SetCurrentTransition calls */
7473 for (OBSSource &tr : defaultTransitions) {
7574 std::string uuid = obs_source_get_uuid (tr);
7675
7776 transitions.insert ({uuid, tr});
7877 transitionNameToUuids.insert ({obs_source_get_name (tr), uuid});
7978
8079 emit TransitionAdded (QT_UTF8 (obs_source_get_name (tr)), QString::fromStdString (uuid));
81-
82- SetCurrentTransition (uuid);
8380 }
81+
82+ SetCurrentTransition (transitionUuids.back ());
8483}
8584
8685void OBSBasic::AddQuickTransitionHotkey (QuickTransition *qt)
@@ -1350,7 +1349,6 @@ void OBSBasic::LoadTransitions(obs_data_array_t *transitionsData, obs_load_sourc
13501349 size_t count = obs_data_array_count (transitionsData);
13511350
13521351 safeModeTransitions.clear ();
1353- /* FIXME: Reduce SetCurrentTransition calls */
13541352 for (size_t i = 0 ; i < count; i++) {
13551353 OBSDataAutoRelease item = obs_data_array_item (transitionsData, i);
13561354 const char *name = obs_data_get_string (item, " name" );
@@ -1368,13 +1366,14 @@ void OBSBasic::LoadTransitions(obs_data_array_t *transitionsData, obs_load_sourc
13681366
13691367 emit TransitionAdded (QT_UTF8 (name), QString::fromStdString (uuid));
13701368
1371- SetCurrentTransition (uuid);
13721369 if (cb)
13731370 cb (private_data, source);
13741371 } else if (safe_mode || disable_3p_plugins) {
13751372 safeModeTransitions.push_back (std::move (item));
13761373 }
13771374 }
1375+
1376+ SetCurrentTransition (transitionUuids.back ());
13781377}
13791378
13801379OBSSource OBSBasic::GetOverrideTransition (OBSSource source)
0 commit comments