Ram Watch - if both auto-load and display on screen are set, don't load the dialog when loading the emulator (just load the watches on screen)

This commit is contained in:
adelikat 2012-08-15 01:03:27 +00:00
parent 3e3b154895
commit 0d867101bf
1 changed files with 8 additions and 1 deletions

View File

@ -248,7 +248,9 @@ namespace BizHawk.MultiClient
LoadState("QuickSave" + Global.Config.SaveSlot.ToString());
if (Global.Config.AutoLoadRamWatch)
{
LoadRamWatch();
}
if (Global.Config.AutoLoadRamSearch)
LoadRamSearch();
if (Global.Config.AutoLoadHexEditor)
@ -2707,8 +2709,13 @@ namespace BizHawk.MultiClient
{
RamWatch1 = new RamWatch();
if (Global.Config.AutoLoadRamWatch && Global.Config.RecentWatches.Length() > 0)
{
RamWatch1.LoadWatchFromRecent(Global.Config.RecentWatches.GetRecentFileByPosition(0));
RamWatch1.Show();
}
if (!Global.Config.DisplayRamWatch)
{
RamWatch1.Show();
}
}
else
RamWatch1.Focus();