diff --git a/src/utils/utility.cpp b/src/utils/utility.cpp index b04292b6..53fa5377 100644 --- a/src/utils/utility.cpp +++ b/src/utils/utility.cpp @@ -617,7 +617,8 @@ void PopulateSourceSelection(QComboBox *list, bool addSelect) list->setCurrentIndex(0); } -void PopulateTransitionSelection(QComboBox *sel, bool addCurrent, bool addAny) +void PopulateTransitionSelection(QComboBox *sel, bool addCurrent, bool addAny, + bool addSelect) { obs_frontend_source_list *transitions = new obs_frontend_source_list(); @@ -633,18 +634,22 @@ void PopulateTransitionSelection(QComboBox *sel, bool addCurrent, bool addAny) sel->model()->sort(0); - AddSelectionEntry(sel, - obs_module_text("AdvSceneSwitcher.selectTransition")); + if (addSelect) { + AddSelectionEntry( + sel, + obs_module_text("AdvSceneSwitcher.selectTransition")); + } sel->setCurrentIndex(0); if (addCurrent) { sel->insertItem( - 1, + addSelect ? 1 : 0, obs_module_text("AdvSceneSwitcher.currentTransition")); } if (addAny) { sel->insertItem( - 1, obs_module_text("AdvSceneSwitcher.anyTransition")); + addSelect ? 1 : 0, + obs_module_text("AdvSceneSwitcher.anyTransition")); } } diff --git a/src/utils/utility.hpp b/src/utils/utility.hpp index 65888bdc..66c54097 100644 --- a/src/utils/utility.hpp +++ b/src/utils/utility.hpp @@ -59,7 +59,7 @@ void AddSelectionEntry(QComboBox *sel, const char *description, void AddSelectionGroup(QComboBox *selection, const QStringList &group, bool addSeparator = true); void PopulateTransitionSelection(QComboBox *sel, bool addCurrent = true, - bool addAny = false); + bool addAny = false, bool addSelect = true); void PopulateWindowSelection(QComboBox *sel, bool addSelect = true); void PopulateAudioSelection(QComboBox *sel, bool addSelect = true); void populateVideoSelection(QComboBox *sel, bool addMainOutput = false,