cleanup ramwatch during rom loads for other platforms a bit. should fix #285. the whole concept of ramwatch when loading other platforms needs some help though (the current watches mutate into some format senseless for the new platform)

This commit is contained in:
zeromus 2014-10-11 19:49:22 +00:00
parent 2fb986715e
commit 200d11df62
2 changed files with 6 additions and 3 deletions

View File

@ -340,7 +340,9 @@ namespace BizHawk.Client.EmuHawk
LoadQuickSave("QuickSave" + Global.Config.SaveSlot);
}
if (Global.Config.RecentWatches.AutoLoad)
//can't do this unless we are autoloading a rom too...
if (Global.Config.RecentWatches.AutoLoad
&& Global.Emulator is IMemoryDomains)
{
GlobalWin.Tools.LoadRamWatch(!Global.Config.DisplayRamWatch);
}

View File

@ -204,9 +204,10 @@ namespace BizHawk.Client.EmuHawk
if (!string.IsNullOrWhiteSpace(_watches.CurrentFileName))
{
_watches.Reload();
UpdateStatusBar();
_watches.RefreshDomans(_core, _core.MemoryDomains.MainMemory);
_watches.Reload();
SetPlatformAndMemoryDomainLabel();
UpdateStatusBar();
}
else
{