From ca24b316409f12315b01dfea4573cc8fd807d5bc Mon Sep 17 00:00:00 2001 From: zeromus Date: Tue, 5 May 2020 17:29:12 -0400 Subject: [PATCH] waterbox - skip only memory consistency check --- src/BizHawk.Client.EmuHawk/MainForm.cs | 2 +- src/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index 58199e2e24..062b0b28af 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -92,7 +92,7 @@ namespace BizHawk.Client.EmuHawk Config.FirmwareUserSpecifications); var prefs = CoreComm.CorePreferencesFlags.None; if (Config.SkipWaterboxIntegrityChecks) - prefs = CoreComm.CorePreferencesFlags.WaterboxCoreConsistencyCheck | CoreComm.CorePreferencesFlags.WaterboxMemoryConsistencyCheck; + prefs = CoreComm.CorePreferencesFlags.WaterboxMemoryConsistencyCheck; return new CoreComm(ShowMessageCoreComm, NotifyCoreComm, cfp, prefs); } diff --git a/src/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs b/src/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs index 91552e26ea..ecae3feffa 100644 --- a/src/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs +++ b/src/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs @@ -416,7 +416,11 @@ namespace BizHawk.Emulation.Cores.Waterbox throw new InvalidOperationException("Savestate corrupted!"); var fileHash = br.ReadBytes(_fileHash.Length); - if (!_skipCoreConsistencyCheck) + if (_skipCoreConsistencyCheck) + { + throw new InvalidOperationException("We decided that the core consistency check should always run"); + } + else { if (!fileHash.SequenceEqual(_fileHash)) // the .dll file that is loaded now has a different hash than the .dll that created the savestate