From 3220809c04272c1a6b4297a2bb85d46aabe82a97 Mon Sep 17 00:00:00 2001
From: WarmUpTill <WarmUpTill@web.de>
Date: Wed, 8 Feb 2023 10:30:15 +0100
Subject: [PATCH] Fix macro list displaying wrong contents after deleting group

This was only a visual issue - the correct macros were deleted in the
backend
---
 src/macro-core/macro-tree.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/macro-core/macro-tree.cpp b/src/macro-core/macro-tree.cpp
index 2d08a5aa..69aab322 100644
--- a/src/macro-core/macro-tree.cpp
+++ b/src/macro-core/macro-tree.cpp
@@ -375,24 +375,24 @@ void MacroTreeModel::Add(std::shared_ptr<Macro> item)
 
 void MacroTreeModel::Remove(std::shared_ptr<Macro> item)
 {
-	auto startIdx = GetItemModelIndex(item);
-	if (startIdx == -1) {
+	auto uiStartIdx = GetItemModelIndex(item);
+	if (uiStartIdx == -1) {
 		return;
 	}
-	auto macroStartIdx = ModelIndexToMacroIndex(startIdx, _macros);
+	auto macroStartIdx = ModelIndexToMacroIndex(uiStartIdx, _macros);
 
-	auto endIdx = startIdx;
+	auto uiEndIdx = uiStartIdx;
 	auto macroEndIdx = macroStartIdx;
 
 	bool isGroup = item->IsGroup();
 	if (isGroup) {
 		macroEndIdx += item->GroupSize();
 		if (!item->IsCollapsed()) {
-			endIdx = item->GroupSize();
+			uiEndIdx += item->GroupSize();
 		}
 	}
 
-	beginRemoveRows(QModelIndex(), startIdx, endIdx);
+	beginRemoveRows(QModelIndex(), uiStartIdx, uiEndIdx);
 	_macros.erase(std::next(_macros.begin(), macroStartIdx),
 		      std::next(_macros.begin(), macroEndIdx + 1));
 	endRemoveRows();