From 5fad651b2dbd8b99c60d70ac9272fa87d32bfc4b Mon Sep 17 00:00:00 2001
From: gxalpha <beckmann.sebastian@outlook.de>
Date: Thu, 19 May 2022 13:30:17 +0200
Subject: [PATCH] Revert "UI: Fix selecting correct transition when deleting"

This reverts commit 3486c0b3633a8ff2b36170d56f37705fe7061349.
---
 UI/window-basic-main-transitions.cpp | 28 ++++++----------------------
 UI/window-basic-main.hpp             |  1 -
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/UI/window-basic-main-transitions.cpp b/UI/window-basic-main-transitions.cpp
index 7b657518c..592740ea8 100644
--- a/UI/window-basic-main-transitions.cpp
+++ b/UI/window-basic-main-transitions.cpp
@@ -101,9 +101,11 @@ void OBSBasic::InitDefaultTransitions()
 	ui->transitions->blockSignals(false);
 }
 
-int OBSBasic::TransitionCount()
+int OBSBasic::AddTransitionBeforeSeparator(const QString &name,
+					   obs_source_t *source)
 {
-	int idx = 0;
+	int idx = -1;
+
 	for (int i = 0; i < ui->transitions->count(); i++) {
 		QVariant v = ui->transitions->itemData(i);
 		if (!v.toString().isEmpty()) {
@@ -112,21 +114,11 @@ int OBSBasic::TransitionCount()
 		}
 	}
 
-	/* should always have at least fade and cut due to them being
-	 * defaults */
-	assert(idx != 0);
-	return idx - 1; /* remove separator from equation */
-}
-
-int OBSBasic::AddTransitionBeforeSeparator(const QString &name,
-					   obs_source_t *source)
-{
-	int idx = TransitionCount();
 	ui->transitions->blockSignals(true);
-	ui->transitions->insertItem(idx, name,
+	ui->transitions->insertItem(idx - 1, name,
 				    QVariant::fromValue(OBSSource(source)));
 	ui->transitions->blockSignals(false);
-	return idx;
+	return idx - 1;
 }
 
 void OBSBasic::AddQuickTransitionHotkey(QuickTransition *qt)
@@ -578,15 +570,7 @@ void OBSBasic::on_transitionRemove_clicked()
 		}
 	}
 
-	ui->transitions->blockSignals(true);
 	ui->transitions->removeItem(idx);
-	ui->transitions->setCurrentIndex(-1);
-	ui->transitions->blockSignals(false);
-
-	int bottomIdx = TransitionCount() - 1;
-	if (idx > bottomIdx)
-		idx = bottomIdx;
-	ui->transitions->setCurrentIndex(idx);
 
 	if (api)
 		api->on_event(OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED);
diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp
index 606800e44..37d231e87 100644
--- a/UI/window-basic-main.hpp
+++ b/UI/window-basic-main.hpp
@@ -446,7 +446,6 @@ private:
 
 	void CreateProgramDisplay();
 	void CreateProgramOptions();
-	int TransitionCount();
 	int AddTransitionBeforeSeparator(const QString &name,
 					 obs_source_t *source);
 	void AddQuickTransitionId(int id);