When playing a movie, don't override the user's Neshawk/Quicknes setting unless it is specified in the movie header

This commit is contained in:
adelikat 2014-05-29 12:25:42 +00:00
parent a19e67deea
commit c211533b20
1 changed files with 3 additions and 2 deletions

View File

@ -43,14 +43,15 @@ namespace BizHawk.Client.EmuHawk
try
{
var quicknesName = ((CoreAttributes)Attribute.GetCustomAttribute(typeof(QuickNES), typeof(CoreAttributes))).CoreName;
var neshawkName = ((CoreAttributes)Attribute.GetCustomAttribute(typeof(NES), typeof(CoreAttributes))).CoreName;
if (!record && Global.Emulator.SystemId == "NES") // For NES we need special logic since the movie will drive which core to load
{
// If either is specified use that, else use whatever is currently set
if (Global.MovieSession.Movie.Header[HeaderKeys.CORE] == quicknesName)
{
Global.Config.NES_InQuickNES = true;
}
else
else if (Global.MovieSession.Movie.Header[HeaderKeys.CORE] == neshawkName)
{
Global.Config.NES_InQuickNES = false;
}