From d6994ea1af35e45aedaee56646500e392bc9bbdf Mon Sep 17 00:00:00 2001
From: scrimpeh <scrimpey@gmail.com>
Date: Mon, 22 Jun 2020 20:47:22 +0200
Subject: [PATCH] ram watch: watches are deleted by index

If you have two watches with an identical address, deleting one will always delete the first one. This commit fixes that
---
 src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
index 09b82a7d08..679fa88ddb 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
@@ -741,14 +741,15 @@ namespace BizHawk.Client.EmuHawk
 
 		private void RemoveWatchMenuItem_Click(object sender, EventArgs e)
 		{
-			var items = SelectedItems.ToList();
-			if (items.Any())
+			var indices = SelectedIndices
+				.OrderByDescending(i => i)
+				.ToList();
+			if (indices.Any())
 			{
-				foreach (var item in items)
+				foreach (var index in indices)
 				{
-					_watches.Remove(item);
+					_watches.RemoveAt(index);
 				}
-
 				WatchListView.RowCount = _watches.Count;
 				GeneralUpdate();
 				UpdateWatchCount();