From db1dc7459119b4104525f0bbb41e3967f596f5c1 Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Sat, 19 Oct 2019 21:28:06 -0400
Subject: [PATCH] Mostly Fix  #1696

---
 BizHawk.Client.Common/tools/CheatList.cs            | 7 ++++++-
 BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Client.Common/tools/CheatList.cs b/BizHawk.Client.Common/tools/CheatList.cs
index 79a8cb95c7..01702817df 100644
--- a/BizHawk.Client.Common/tools/CheatList.cs
+++ b/BizHawk.Client.Common/tools/CheatList.cs
@@ -384,7 +384,9 @@ namespace BizHawk.Client.Common
 						}
 						else
 						{
-							// Set to hex for saving 
+							// Set to hex for saving
+							var temp_cheat_type = cheat.Type;
+
 							cheat.SetType(DisplayType.Hex);
 
 							sb
@@ -399,6 +401,9 @@ namespace BizHawk.Client.Common
 								.Append((cheat.BigEndian ?? false) ? '1' : '0').Append('\t')
 								.Append(cheat.ComparisonType).Append('\t')
 								.AppendLine();
+
+							cheat.SetType(temp_cheat_type);
+
 						}
 					}
 
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs b/BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs
index ae4fbcc6cb..9ff28c358a 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs
@@ -72,8 +72,8 @@ namespace BizHawk.Client.EmuHawk
 
 			set
 			{
-				_type = value;
 				var val = ToRawInt();
+				_type = value;				
 				SetMaxLength();
 				SetFromRawInt(val);
 			}