From 85886bc2cd67b6411e1c20d84088d2677e6ddad9 Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Sun, 16 Jun 2024 19:54:54 +0200
Subject: [PATCH] Don't freeze first selection in HexEditor when freezing was
 canceled

- fixes #3833

The entire "primary highlight" + n "secondary highlights" system seems overengineered, but I chose to just fix this in the simplest way possible.
---
 src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
index 34fba8ef9c..ec5373e6b3 100644
--- a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
@@ -854,6 +854,7 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
+			var cheats = new List<Cheat>();
 			if (_highlightedAddress >= 0)
 			{
 				var watch = Watch.GenerateWatch(
@@ -863,14 +864,13 @@ namespace BizHawk.Client.EmuHawk
 					Common.WatchDisplayType.Hex,
 					BigEndian);
 
-				MainForm.CheatList.Add(new Cheat(
+				cheats.Add(new Cheat(
 					watch,
 					watch.Value));
 			}
 
 			if (_secondaryHighlightedAddresses.Any())
 			{
-				var cheats = new List<Cheat>();
 				foreach (var address in _secondaryHighlightedAddresses)
 				{
 					var watch = Watch.GenerateWatch(
@@ -884,10 +884,10 @@ namespace BizHawk.Client.EmuHawk
 						watch,
 						watch.Value));
 				}
-
-				MainForm.CheatList.AddRange(cheats);
 			}
 
+			MainForm.CheatList.AddRange(cheats);
+
 			MemoryViewerBox.Refresh();
 		}