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

Merge pull request #1220 from Frank-74/patch-5 

Fix ROM name displayed if save doesn't exist.
This commit is contained in:
zilmar 2016-11-23 10:47:47 +11:00 committed by GitHub
parent 25a5784623 c727365afe
commit 0295020e35
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Project64-core/N64System/N64Class.cpp
View File

@ -1674,6 +1674,7 @@ bool CN64System::LoadState()
return true;
}
}
CPath NewFileName = FileName;
//Use old file Name
if (g_Settings->LoadDword(Game_CurrentSaveState) != 0)
@ -1686,6 +1687,17 @@ bool CN64System::LoadState()
}
bool Result = LoadState(FileName);
WriteTrace(TraceN64System, TraceDebug, "Done (res: %s)", Result ? "True" : "False");
if (Result == false)
{
if (g_Settings->LoadDword(Setting_AutoZipInstantSave))
{
Result = LoadState(ZipFileName);
}
else
{
Result = LoadState(NewFileName);
}
}
return Result;
}