ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Rom] Do not load ROM settings if a disk is loaded 

It will prioritize the settings from disk if one is loaded.
This commit is contained in:
LuigiBlood 2019-08-13 20:26:23 +02:00
parent 16e474df42
commit c7bbd12b41
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-core/N64System/N64RomClass.cpp
View File

@ -658,6 +658,7 @@ bool CN64Rom::LoadN64Image(const char * FileLoc, bool LoadBootCodeOnly)
if (!LoadBootCodeOnly && g_Rom == this) if (!LoadBootCodeOnly && g_Rom == this)
{ {
g_Settings->SaveBool(GameRunning_LoadingInProgress, false); g_Settings->SaveBool(GameRunning_LoadingInProgress, false);
if (!g_Disk)
SaveRomSettingID(false); SaveRomSettingID(false);
} }
@ -822,7 +823,6 @@ bool CN64Rom::LoadN64ImageIPL(const char * FileLoc, bool LoadBootCodeOnly)
if (!LoadBootCodeOnly && g_DDRom == this) if (!LoadBootCodeOnly && g_DDRom == this)
{ {
g_Settings->SaveBool(GameRunning_LoadingInProgress, false); g_Settings->SaveBool(GameRunning_LoadingInProgress, false);
SaveRomSettingID(false);
} }
if (g_Settings->LoadBool(Game_CRC_Recalc)) if (g_Settings->LoadBool(Game_CRC_Recalc))