waterbox - skip only memory consistency check

This commit is contained in:
zeromus 2020-05-05 17:29:12 -04:00
parent 74ba281463
commit ca24b31640
2 changed files with 6 additions and 2 deletions

View File

@ -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);
}

View File

@ -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