Fix crash when "NES with QuickNes" is selected, and the user attempts to load a FDS game without a proper FDS BIOS. Also, update the core statusbar label when bailing out of a failed Rom load attempt

This commit is contained in:
adelikat 2014-07-31 20:42:12 +00:00
parent a9e6d984b2
commit 0fd5ddd0cf
2 changed files with 2 additions and 2 deletions
BizHawk.Client.Common
BizHawk.Client.EmuHawk

View File

@ -448,8 +448,7 @@ namespace BizHawk.Client.Common
// Specific hack here, as we get more cores of the same system, this isn't scalable
if (ex is LibQuickNES.UnsupportedMapperException)
{
LoadRom(path, nextComm, forceAccurateCore: true);
return true;
return LoadRom(path, nextComm, forceAccurateCore: true);
}
else
{

View File

@ -3187,6 +3187,7 @@ namespace BizHawk.Client.EmuHawk
}
else
{
UpdateCoreStatusBarButton();
return false;
}
}