ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix problems with stale memorydomains in hex editor. fixes issue #262

This commit is contained in:
zeromus 2014-09-13 20:37:14 +00:00
parent b076603a1e
commit 7fea5f8543
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
View File

@ -59,7 +59,7 @@ namespace BizHawk.Client.EmuHawk
private bool _bigEndian;
private int _dataSize;
private readonly MemoryDomainList MemoryDomains;
private MemoryDomainList MemoryDomains;
public HexEditor()
{
@ -67,7 +67,6 @@ namespace BizHawk.Client.EmuHawk
fontWidth = (int)font.Size;
fontHeight = font.Height + 1;
MemoryDomains = ((IMemoryDomains)Global.Emulator).MemoryDomains; // The cast is intentional, we want a specific cast error, not an eventual null reference error
InitializeComponent();
AddressesLabel.BackColor = Color.Transparent;
LoadConfigSettings();
@ -79,6 +78,8 @@ namespace BizHawk.Client.EmuHawk
AddressLabel.Font = font;
TopMost = Global.Config.HexEditorSettings.TopMost;
Restart();
}
private int? HighlightedAddress
@ -132,16 +133,21 @@ namespace BizHawk.Client.EmuHawk
public void Restart()
{
MemoryDomains = null;
if (!Global.Emulator.HasMemoryDomains())
{
Close();
}
if (!IsHandleCreated || IsDisposed)
{
return;
}
MemoryDomains = ((IMemoryDomains)Global.Emulator).MemoryDomains; // The cast is intentional, we want a specific cast error, not an eventual null reference error
var theDomain = _domain.Name.ToLower() == "file on disk" ? 999 : GetDomainInt(_domain.Name);
SetMemoryDomainMenu(); // Calls update routines, TODO: refactor, that is confusing!
@ -456,6 +462,8 @@ namespace BizHawk.Client.EmuHawk
private void HexEditor_Load(object sender, EventArgs e)
{
Restart();
_defaultWidth = Size.Width; // Save these first so that the user can restore to its original size
_defaultHeight = Size.Height;