From c7bbd12b41b02951ea81a5a7a8ae208cfefdb17a Mon Sep 17 00:00:00 2001 From: LuigiBlood Date: Tue, 13 Aug 2019 20:26:23 +0200 Subject: [PATCH] [Rom] Do not load ROM settings if a disk is loaded It will prioritize the settings from disk if one is loaded. --- Source/Project64-core/N64System/N64RomClass.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Project64-core/N64System/N64RomClass.cpp b/Source/Project64-core/N64System/N64RomClass.cpp index b7d723235..ae3e25725 100644 --- a/Source/Project64-core/N64System/N64RomClass.cpp +++ b/Source/Project64-core/N64System/N64RomClass.cpp @@ -658,7 +658,8 @@ bool CN64Rom::LoadN64Image(const char * FileLoc, bool LoadBootCodeOnly) if (!LoadBootCodeOnly && g_Rom == this) { g_Settings->SaveBool(GameRunning_LoadingInProgress, false); - SaveRomSettingID(false); + if (!g_Disk) + SaveRomSettingID(false); } if (g_Settings->LoadBool(Game_CRC_Recalc)) @@ -822,7 +823,6 @@ bool CN64Rom::LoadN64ImageIPL(const char * FileLoc, bool LoadBootCodeOnly) if (!LoadBootCodeOnly && g_DDRom == this) { g_Settings->SaveBool(GameRunning_LoadingInProgress, false); - SaveRomSettingID(false); } if (g_Settings->LoadBool(Game_CRC_Recalc))