From 0a643af6dfd79a90790fbca2803a52bbe6bf7f39 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 20 Mar 2021 22:45:15 -0500 Subject: [PATCH] Hex Editor .tbl file loading - clear table before loading a new one, ignore empty lines in file --- src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs index 073334bd00..c85c395c48 100644 --- a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs +++ b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs @@ -1209,6 +1209,7 @@ namespace BizHawk.Client.EmuHawk return false; } + _textTable.Clear(); var file = new FileInfo(path); if (!file.Exists) { @@ -1219,6 +1220,11 @@ namespace BizHawk.Client.EmuHawk string line; while ((line = sr.ReadLine()) != null) { + if (string.IsNullOrWhiteSpace(line)) + { + continue; + } + var parts = line.Split('='); _textTable.Add(int.Parse(parts[0], NumberStyles.HexNumber), parts[1].First()); }