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

CheatList - move a config check to the calling code

This commit is contained in:
adelikat 2020-05-25 17:29:57 -05:00
parent 705af68f65
commit e498476b55
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/BizHawk.Client.Common/tools/CheatList.cs
View File

@ -310,21 +310,18 @@ namespace BizHawk.Client.Common
public void SaveOnClose()
{
if (Global.Config.CheatsAutoSaveOnClose)
if (Changes && _cheatList.Any())
{
if (Changes && _cheatList.Any())
if (string.IsNullOrWhiteSpace(CurrentFileName))
{
if (string.IsNullOrWhiteSpace(CurrentFileName))
{
CurrentFileName = _defaultFileName;
}
CurrentFileName = _defaultFileName;
}
SaveFile(CurrentFileName);
}
else if (!_cheatList.Any() && !string.IsNullOrWhiteSpace(CurrentFileName))
{
new FileInfo(CurrentFileName).Delete();
}
SaveFile(CurrentFileName);
}
else if (!_cheatList.Any() && !string.IsNullOrWhiteSpace(CurrentFileName))
{
new FileInfo(CurrentFileName).Delete();
}
}

6
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -3891,7 +3891,11 @@ namespace BizHawk.Client.EmuHawk
Tools.Get<TraceLogger>().Restart();
}
CheatList.SaveOnClose();
if (Config.CheatsAutoSaveOnClose)
{
CheatList.SaveOnClose();
}
Emulator.Dispose();
Emulator = new NullEmulator();
ClientApi.UpdateEmulatorAndVP(Emulator);