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

Mainform - a bit of cleanup

This commit is contained in:
adelikat 2019-12-22 09:44:23 -06:00
parent bd48ee7130
commit c162b2774d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3835,7 +3835,7 @@ namespace BizHawk.Client.EmuHawk
if (Config.LoadCheatFileByGame)
{
CheatList.SetDefaultFileName(GlobalWin.Tools.GenerateDefaultCheatFilename());
CheatList.SetDefaultFileName(Tools.GenerateDefaultCheatFilename());
if (CheatList.AttemptToLoadCheatFile())
{
AddOnScreenMessage("Cheats file loaded");
@ -3876,19 +3876,19 @@ namespace BizHawk.Client.EmuHawk
ClientApi.OnRomLoaded(Emulator);
return true;
}
else if (!(Emulator is NullEmulator))
{
// The ROM has been loaded by a recursive invocation of the LoadROM method.
ClientApi.OnRomLoaded(Emulator);
return true;
}
else
else if (Emulator.IsNull())
{
// This shows up if there's a problem
ClientApi.UpdateEmulatorAndVP(Emulator);
OnRomChanged();
return false;
}
else
{
// The ROM has been loaded by a recursive invocation of the LoadROM method.
ClientApi.OnRomLoaded(Emulator);
return true;
}
}
finally
{