Fix so that tool dialogs such as Ram watch update on loadstate, Ram Watch - AddWatch() triggers Changes() function, Separator no longer shows Change Count = 0

BizHawk.MultiClient/MainForm.cs

@@ -1399,12 +1399,7 @@ namespace BizHawk.MultiClient
 				Global.Emulator.FrameAdvance(!throttle.skipnextframe);
 				//=======================================
 
-				RamWatch1.UpdateValues();
-				RamSearch1.UpdateValues();
-				HexEditor1.UpdateValues();
-				NESNameTableViewer1.UpdateValues();
-				NESPPU1.UpdateValues();
-				TAStudio1.UpdateValues();
+				UpdateTools();
 
 			}
 
@@ -1414,6 +1409,19 @@ namespace BizHawk.MultiClient
 				Global.Sound.UpdateSound(NullSound.SilenceProvider);
 		}
 
+		/// <summary>
+		/// Update all tools that are frame dependent like Ram Search
+		/// </summary>
+		public void UpdateTools()
+		{
+			RamWatch1.UpdateValues();
+			RamSearch1.UpdateValues();
+			HexEditor1.UpdateValues();
+			NESNameTableViewer1.UpdateValues();
+			NESPPU1.UpdateValues();
+			TAStudio1.UpdateValues();
+		}
+
 		private void MakeScreenshot(string path)
 		{
 			var video = Global.Emulator.VideoProvider;
@@ -1575,6 +1583,7 @@ namespace BizHawk.MultiClient
 			var reader = new StreamReader(path);
 			Global.Emulator.LoadStateText(reader);
 			HandleMovieLoadState(reader);
+			UpdateTools();
 			reader.Close();
 			Global.RenderPanel.AddMessage("Loaded state: " + name);
 		}

BizHawk.MultiClient/tools/RamWatch.cs

@@ -239,7 +239,8 @@ namespace BizHawk.MultiClient
 			}
 			if (column == 3) //Change Counts
 			{
-				text = watchList[index].changecount.ToString();
+				if (watchList[index].type != atype.SEPARATOR)
+					text = watchList[index].changecount.ToString();
 			}
 			if (column == 4) //Notes
 			{
@@ -455,7 +456,8 @@ namespace BizHawk.MultiClient
 			if (r.userSelected == true)
 			{
 				watchList.Add(r.watch);
-				DisplayWatchList(); //TODO: Do I need these calls?
+				Changes();
+				DisplayWatchList();
 			}
 		}