From 2835694546866999a8b47fcdc267710630813302 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 3 Nov 2019 11:20:50 -0600
Subject: [PATCH] Hex Editor - fix crash when typing values into the hex editor
 with no address highlighted

---
 .../tools/HexEditor/HexEditor.cs              | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
index 618853b272..c82e2026c5 100644
--- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
+++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
@@ -1964,8 +1964,12 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			// TODO: ignore these keypresses if no highlighted address
-			long _addressHighlighted = _highlightedAddress ?? -1; // TODO: delete me
+			if (!_highlightedAddress.HasValue)
+			{
+				return;
+			}
+
+			var currentAddress = _highlightedAddress ?? 0;
 			switch (DataSize)
 			{
 				default:
@@ -1978,9 +1982,9 @@ namespace BizHawk.Client.EmuHawk
 					{
 						var temp = _nibbles[0].ToString() + ForceCorrectKeyString(e.KeyChar);
 						var x = byte.Parse(temp, NumberStyles.HexNumber);
-						_domain.PokeByte(_addressHighlighted, x);
+						_domain.PokeByte(currentAddress, x);
 						ClearNibbles();
-						SetHighlighted(_addressHighlighted + 1);
+						SetHighlighted(currentAddress + 1);
 						UpdateValues();
 						Refresh();
 					}
@@ -2007,9 +2011,9 @@ namespace BizHawk.Client.EmuHawk
 						var temp2 = _nibbles[2].ToString() + ((char)e.KeyChar);
 						var x2 = byte.Parse(temp2, NumberStyles.HexNumber);
 
-						PokeWord(_addressHighlighted, x1, x2);
+						PokeWord(currentAddress, x1, x2);
 						ClearNibbles();
-						SetHighlighted(_addressHighlighted + 2);
+						SetHighlighted(currentAddress + 2);
 						UpdateValues();
 						Refresh();
 					}
@@ -2058,10 +2062,10 @@ namespace BizHawk.Client.EmuHawk
 						var temp4 = _nibbles[6].ToString() + ForceCorrectKeyString(e.KeyChar);
 						var x4 = byte.Parse(temp4, NumberStyles.HexNumber);
 
-						PokeWord(_addressHighlighted, x1, x2);
-						PokeWord(_addressHighlighted + 2, x3, x4);
+						PokeWord(currentAddress, x1, x2);
+						PokeWord(currentAddress + 2, x3, x4);
 						ClearNibbles();
-						SetHighlighted(_addressHighlighted + 4);
+						SetHighlighted(currentAddress + 4);
 						UpdateValues();
 						Refresh();
 					}