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

[Rom] Use Base Game Save File if loaded both a disk and cart

This commit is contained in:
LuigiBlood 2019-08-13 21:34:55 +02:00
parent 9cc6da17ff
commit 239c8f1128
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -660,6 +660,8 @@ bool CN64Rom::LoadN64Image(const char * FileLoc, bool LoadBootCodeOnly)
g_Settings->SaveBool(GameRunning_LoadingInProgress, false); g_Settings->SaveBool(GameRunning_LoadingInProgress, false);
if (!g_Disk) if (!g_Disk)
SaveRomSettingID(false); SaveRomSettingID(false);
else if (!IsLoadedRomDDIPL())
g_Settings->SaveString(Game_GameName, m_RomName.c_str()); //Use Base Game's Save File if loaded in combo
} }
if (g_Settings->LoadBool(Game_CRC_Recalc)) if (g_Settings->LoadBool(Game_CRC_Recalc))