Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-22 17:04:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve detected savefile load speeds

Browse Source 
Don't discard the initially detected data just to re-load it from the path; keep a reference and load the reference.
This commit is contained in:
Kurt
2020-04-16 13:15:35 -07:00
parent e9406599e0
commit 24edf7efe5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PKHeX.WinForms/MainWindow/Main.cs
View File

@@ -188,13 +188,13 @@ private void FormLoadInitialFiles(string[] args)
#endif
{
string path = null;
if (Settings.Default.DetectSaveOnStartup && !DetectSaveFile(out path) && path != null)
SaveFile sav = null;
if (Settings.Default.DetectSaveOnStartup && !DetectSaveFile(out path, out sav) && path != null)
WinFormsUtil.Error(path); // `path` contains the error message
bool savLoaded = false;
if (path != null && File.Exists(path))
if (sav != null)
{
var sav = SaveUtil.GetVariantSAV(path);
savLoaded = OpenSAV(sav, path);
}
if (!savLoaded)
@@ -1204,16 +1204,16 @@ private void ClickExportSAV(object sender, EventArgs e)
private void ClickSaveFileName(object sender, EventArgs e)
{
if (!DetectSaveFile(out string path))
if (!DetectSaveFile(out string path, out var sav))
return;
if (WinFormsUtil.Prompt(MessageBoxButtons.YesNo, MsgFileLoadSaveDetectReload, path) == DialogResult.Yes)
OpenQuick(path); // load save
LoadFile(sav, path); // load save
}
private static bool DetectSaveFile(out string path)
private static bool DetectSaveFile(out string path, out SaveFile sav)
{
string msg = null;
var sav = SaveFinder.FindMostRecentSaveFile(Environment.GetLogicalDrives(), ref msg);
sav = SaveFinder.FindMostRecentSaveFile(Environment.GetLogicalDrives(), ref msg);
if (sav == null && !string.IsNullOrWhiteSpace(msg))
WinFormsUtil.Error(msg);