From 3bf11dbf688d6e29239bd077cb20a5b407cdd982 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Wed, 21 Sep 2016 10:56:57 -0400
Subject: [PATCH] Fix slow Ctrl+A on Ram Search and Ram Watch, fixes #630

---
 BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs | 5 +++++
 BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
index e96cee76ea..19806561fa 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
@@ -1729,6 +1729,11 @@ namespace BizHawk.Client.EmuHawk
 
 		private void WatchListView_SelectedIndexChanged(object sender, EventArgs e)
 		{
+			if (WatchListView.SelectAllInProgress)
+			{
+				return;
+			}
+
 			RemoveToolBarItem.Enabled =
 				AddToRamWatchToolBarItem.Enabled =
 				SelectedIndices.Any();
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
index f8ef58e4ac..161ad0c479 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
@@ -1140,6 +1140,11 @@ namespace BizHawk.Client.EmuHawk
 
 		private void WatchListView_SelectedIndexChanged(object sender, EventArgs e)
 		{
+			if (WatchListView.SelectAllInProgress)
+			{
+				return;
+			}
+
 			PokeAddressToolBarItem.Enabled =
 				FreezeAddressToolBarItem.Enabled =
 				SelectedIndices.Any() &&