From 5e40adf1f7d4c9a63156f2cb4fafcc223ecba697 Mon Sep 17 00:00:00 2001 From: zeromus Date: Mon, 31 Aug 2015 11:37:46 -0500 Subject: [PATCH] fix #490 --- BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs index f0acd38094..0c6a2fa4ca 100644 --- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs +++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs @@ -127,7 +127,7 @@ namespace BizHawk.Client.EmuHawk public void UpdateValues() { - AddressesLabel.Text = GenerateMemoryViewString(); + AddressesLabel.Text = GenerateMemoryViewString(true); AddressLabel.Text = GenerateAddressString(); } @@ -486,7 +486,7 @@ namespace BizHawk.Client.EmuHawk return addrStr.ToString(); } - private string GenerateMemoryViewString() + private string GenerateMemoryViewString(bool forWindow) { var rowStr = new StringBuilder(); @@ -521,7 +521,11 @@ namespace BizHawk.Client.EmuHawk { if (_addr + k < _domain.Size) { - rowStr.Append(Remap(MakeByte(_addr + k))); + byte b = MakeByte(_addr + k); + char c = Remap(b); + rowStr.Append(c); + //winforms will be using these as escape codes for hotkeys + if (forWindow) if (c == '&') rowStr.Append('&'); } }