Skip to content

Commit 2f93c48

Browse files
committed
frontend: Reduce SetCurrentTransition calls
1 parent 75b8d8a commit 2f93c48

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

frontend/widgets/OBSBasic_Transitions.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ 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

@@ -79,9 +78,9 @@ void OBSBasic::InitDefaultTransitions()
7978
transitionUuids.push_back(uuid);
8079

8180
emit TransitionAdded(QT_UTF8(obs_source_get_name(tr)), QString::fromStdString(uuid));
82-
83-
SetCurrentTransition(uuid);
8481
}
82+
83+
SetCurrentTransition(transitionUuids.back());
8584
}
8685

8786
void OBSBasic::AddQuickTransitionHotkey(QuickTransition *qt)
@@ -1355,7 +1354,6 @@ void OBSBasic::LoadTransitions(obs_data_array_t *transitionsData, obs_load_sourc
13551354
size_t count = obs_data_array_count(transitionsData);
13561355

13571356
safeModeTransitions.clear();
1358-
/* FIXME: Reduce SetCurrentTransition calls */
13591357
for (size_t i = 0; i < count; i++) {
13601358
OBSDataAutoRelease item = obs_data_array_item(transitionsData, i);
13611359
const char *name = obs_data_get_string(item, "name");
@@ -1373,13 +1371,14 @@ void OBSBasic::LoadTransitions(obs_data_array_t *transitionsData, obs_load_sourc
13731371

13741372
emit TransitionAdded(QT_UTF8(name), QString::fromStdString(uuid));
13751373

1376-
SetCurrentTransition(uuid);
13771374
if (cb)
13781375
cb(private_data, source);
13791376
} else if (safe_mode || disable_3p_plugins) {
13801377
safeModeTransitions.push_back(std::move(item));
13811378
}
13821379
}
1380+
1381+
SetCurrentTransition(transitionUuids.back());
13831382
}
13841383

13851384
OBSSource OBSBasic::GetOverrideTransition(OBSSource source)

0 commit comments

Comments
 (0)