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

Merge branch 'master' of https://github.com/project64/project64

This commit is contained in:
zilmar 2016-11-23 19:36:04 +11:00
parent 040d19d0bc 0a89360f66
commit b22f93d4c2
2 changed files with 15 additions and 1 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;
}

4
Source/Project64/UserInterface/RomBrowserClass.cpp
View File

@ -331,6 +331,8 @@ void CRomBrowser::HighLightLastRom(void)
{
return;
}
m_LastRom = UISettingsLoadStringIndex(File_RecentGameFileIndex, 0);
//Make sure Rom browser is visible
if (!RomBrowserVisible()) { return; }
@ -1273,4 +1275,4 @@ bool CRomBrowser::GetRomFileNames(strlist & FileList, const CPath & BaseDirector
}
} while (SearchPath.FindNext());
return true;
}
}