From 611e21dd472a2cd5d58d242343bdc7d661ef41e8 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 16 Nov 2013 15:03:37 +0000
Subject: [PATCH] Ram Search - fix behavior of Restore Default settings

---
 BizHawk.Client.Common/config/Config.cs        |  2 +-
 .../tools/Watch/RamSearch.cs                  | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/BizHawk.Client.Common/config/Config.cs b/BizHawk.Client.Common/config/Config.cs
index 158bc5371c..d52e942994 100644
--- a/BizHawk.Client.Common/config/Config.cs
+++ b/BizHawk.Client.Common/config/Config.cs
@@ -251,7 +251,7 @@ namespace BizHawk.Client.Common
 		public bool RamSearchAlwaysOnTop = false;
 
 		public Dictionary<string, int> RamSearchColumnWidths = new Dictionary<string, int>
-			{
+		{
 			{ "AddressColumn", -1 },
 			{ "ValueColumn", -1 },
 			{ "PrevColumn", -1 },
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
index f853f93a4a..e447b220b9 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
@@ -565,10 +565,7 @@ namespace BizHawk.Client.EmuHawk
 
 			for (int i = 0; i < Columns.Count; i++)
 			{
-				if (WatchListView.Columns.ContainsKey(Columns[i].Key))
-				{
-					WatchListView.Columns[Columns[i].Key].DisplayIndex = i;
-				}
+				WatchListView.Columns[Columns[i].Key].DisplayIndex = i;
 			}
 		}
 
@@ -1338,7 +1335,22 @@ namespace BizHawk.Client.EmuHawk
 			Global.Config.RamSearchSaveWindowPosition = true;
 			Global.Config.RamSearchAlwaysOnTop = TopMost = false;
 
+			Global.Config.RamSearchColumnWidths = new Dictionary<string, int>
+				{
+					{ "AddressColumn", -1 },
+					{ "ValueColumn", -1 },
+					{ "PrevColumn", -1 },
+					{ "ChangesColumn", -1 },
+					{ "DiffColumn", -1 },
+				};
+
 			LoadColumnInfo();
+
+			Settings = new RamSearchEngine.Settings();
+			if (Settings.Mode == RamSearchEngine.Settings.SearchMode.Fast)
+			{
+				SetToFastMode();
+			}
 		}
 
 		#endregion