From 4205f989a42f2886fa72de59b34c89d39216b4d6 Mon Sep 17 00:00:00 2001 From: LuigiBlood Date: Fri, 19 Jun 2020 21:37:08 +0200 Subject: [PATCH] [Save State] Compare 64DD save state header more proper --- Source/Project64-core/N64System/N64Class.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Project64-core/N64System/N64Class.cpp b/Source/Project64-core/N64System/N64Class.cpp index 1c403561a..2d5897637 100644 --- a/Source/Project64-core/N64System/N64Class.cpp +++ b/Source/Project64-core/N64System/N64Class.cpp @@ -2003,8 +2003,8 @@ bool CN64System::LoadState(const char * FileName) if (g_Settings->LoadBool(Setting_EnableDisk) && g_Disk) { //Base ROM Information (64DD IPL / Compatible Game ROM) & Disk Info Check - if (memcmp(LoadHeader, &g_Rom->GetRomAddress()[0x10], 0x20) != 0 && - memcmp(&LoadHeader[0x20], g_Disk->GetDiskAddressID(), 0x20) != 0 && + if ((memcmp(LoadHeader, &g_Rom->GetRomAddress()[0x10], 0x20) != 0 || + memcmp(&LoadHeader[0x20], g_Disk->GetDiskAddressID(), 0x20) != 0) && !g_Notify->AskYesNoQuestion(g_Lang->GetString(MSG_SAVE_STATE_HEADER).c_str())) { return false; @@ -2098,8 +2098,8 @@ bool CN64System::LoadState(const char * FileName) if (g_Settings->LoadBool(Setting_EnableDisk) && g_Disk) { //Base ROM Information (64DD IPL / Compatible Game ROM) & Disk Info Check - if (memcmp(LoadHeader, &g_Rom->GetRomAddress()[0x10], 0x20) != 0 && - memcmp(&LoadHeader[0x20], g_Disk->GetDiskAddressID(), 0x20) != 0 && + if ((memcmp(LoadHeader, &g_Rom->GetRomAddress()[0x10], 0x20) != 0 || + memcmp(&LoadHeader[0x20], g_Disk->GetDiskAddressID(), 0x20) != 0) && !g_Notify->AskYesNoQuestion(g_Lang->GetString(MSG_SAVE_STATE_HEADER).c_str())) { return false;