From ab3377184a8c13df4d125d21c8c4c6d7ffeef3b7 Mon Sep 17 00:00:00 2001
From: goyuken <goyuken@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Thu, 4 Oct 2012 21:01:58 +0000
Subject: [PATCH] RamWatch: fix bug where the "Value" column showed previous
 and not current

---
 BizHawk.MultiClient/tools/RamWatch.cs | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index 19f6893a6d..b31c01dd63 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -235,23 +235,15 @@ namespace BizHawk.MultiClient
 				return;
 			}
 
-			switch(column)
+			switch (column)
 			{
-				case 0:
+				case 0: // address
 					text = Watches[index].Address.ToString(addressFormatStr);
 					break;
-				case 1:
-					switch(Global.Config.RamWatchPrev_Type)
-					{
-						case 1:
-							text = Watches[index].PrevString;
-							break;
-						case 2:
-							text = Watches[index].LastChangeString;
-							break;
-					}
+				case 1: // value
+					text = Watches[index].ValueString;
 					break;
-				case 2:
+				case 2: // prev
 					switch (Global.Config.RamWatchPrev_Type)
 					{
 						case 1:
@@ -262,10 +254,10 @@ namespace BizHawk.MultiClient
 							break;
 					}
 					break;
-				case 3:
+				case 3: // changes
 					text = Watches[index].Changecount.ToString();
 					break;
-				case 4:
+				case 4: // diff
 					switch (Global.Config.RamWatchPrev_Type)
 					{
 						case 1:
@@ -276,10 +268,10 @@ namespace BizHawk.MultiClient
 							break;
 					}
 					break;
-				case 5:
+				case 5: // domain
 					text = Watches[index].Domain.Name;
 					break;
-				case 6:
+				case 6: // notes
 					text = Watches[index].Notes;
 					break;
 			}