From c211533b20e9c6df9af04ae732d642b0dc5bab70 Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 29 May 2014 12:25:42 +0000 Subject: [PATCH] When playing a movie, don't override the user's Neshawk/Quicknes setting unless it is specified in the movie header --- BizHawk.Client.EmuHawk/MainForm.Movie.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs index 9243fde0ca..844c348bc1 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs @@ -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; }