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

Move autoloading of tools to the Shown event fixes #334

This commit is contained in:
adelikat 2019-11-17 11:35:53 -06:00
parent 16f977a87c
commit 4c57718f7d
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -3234,6 +3234,23 @@ namespace BizHawk.Client.EmuHawk
private void MainForm_Shown(object sender, EventArgs e) private void MainForm_Shown(object sender, EventArgs e)
{ {
if (Emulator is TI83 && Global.Config.TI83autoloadKeyPad)
{
GlobalWin.Tools.Load<TI83KeyPad>();
}
GlobalWin.Tools.AutoLoad();
if (Global.Config.RecentWatches.AutoLoad)
{
GlobalWin.Tools.LoadRamWatch(!Global.Config.DisplayRamWatch);
}
if (Global.Config.RecentCheats.AutoLoad)
{
GlobalWin.Tools.Load<Cheats>();
}
HandlePlatformMenus(); HandlePlatformMenus();
} }

17
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -387,18 +387,6 @@ namespace BizHawk.Client.EmuHawk
else GlobalWin.Tools.LuaConsole.LoadLuaFile(_argParser.luaScript); else GlobalWin.Tools.LuaConsole.LoadLuaFile(_argParser.luaScript);
} }
GlobalWin.Tools.AutoLoad();
if (Global.Config.RecentWatches.AutoLoad)
{
GlobalWin.Tools.LoadRamWatch(!Global.Config.DisplayRamWatch);
}
if (Global.Config.RecentCheats.AutoLoad)
{
GlobalWin.Tools.Load<Cheats>();
}
SetStatusBar(); SetStatusBar();
if (Global.Config.StartPaused) if (Global.Config.StartPaused)
@ -3613,11 +3601,6 @@ namespace BizHawk.Client.EmuHawk
Emulator.CoreComm.RomStatusAnnotation = "Multi-disk bundler"; Emulator.CoreComm.RomStatusAnnotation = "Multi-disk bundler";
} }
if (Emulator is TI83 && Global.Config.TI83autoloadKeyPad)
{
GlobalWin.Tools.Load<TI83KeyPad>();
}
if (loader.LoadedEmulator is NES nes) if (loader.LoadedEmulator is NES nes)
{ {
if (!string.IsNullOrWhiteSpace(nes.GameName)) if (!string.IsNullOrWhiteSpace(nes.GameName))