From af6369e14c08f97359e0854f8b19d837079e2eb1 Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 25 Nov 2013 23:41:08 +0000 Subject: [PATCH] Fix behavior of remove in Ram Watch and Cheats too --- BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs | 5 +++-- BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs | 4 ++-- BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index 8103e381ff..389ac51f19 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -395,9 +395,10 @@ namespace BizHawk.Client.EmuHawk private void Remove() { - if (SelectedItems.Any()) + var items = SelectedItems.ToList(); + if (items.Any()) { - foreach (var item in SelectedItems) + foreach (var item in items) { Global.CheatList.Remove(item); } diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index 59b73eb881..89839c443c 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -450,9 +450,9 @@ namespace BizHawk.Client.EmuHawk get { return SelectedIndices.Select(index => _searches[index]); } } - private List SelectedWatches + private IEnumerable SelectedWatches { - get { return SelectedItems.Where(x => !x.IsSeparator).ToList(); } + get { return SelectedItems.Where(x => !x.IsSeparator); } } private void SetRemovedMessage(int val) diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index d52d14564d..2188bbb0d8 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -519,9 +519,10 @@ namespace BizHawk.Client.EmuHawk private void RemoveWatch() { - if (SelectedItems.Any()) + var items = SelectedItems.ToList(); + if (items.Any()) { - foreach (var item in SelectedItems) + foreach (var item in items) { _watches.Remove(item); }