always add core name to savestate filenames, fixes #2051. Negative consequences is that for all ocres that did not previously have multiple core options, previous save slots will be "lost" to the user (files will still be there but bizhawk won't detect them)

This commit is contained in:
adelikat 2020-05-27 15:54:53 -05:00
parent 7e53ef69ed
commit b1c294c236
1 changed files with 1 additions and 22 deletions

View File

@ -3424,23 +3424,7 @@ namespace BizHawk.Client.EmuHawk
public string SaveStatePrefix()
{
var name = Game.FilesystemSafeName();
// Neshawk and Quicknes have incompatible savestates, store the name to keep them separate
if (Emulator.SystemId == "NES")
{
name += $".{Emulator.Attributes().CoreName}";
}
// Gambatte and GBHawk have incompatible savestates, store the name to keep them separate
if (Emulator.SystemId == "GB")
{
name += $".{Emulator.Attributes().CoreName}";
}
if (Emulator is Snes9x) // Keep snes9x savestate away from libsnes, we want to not be too tedious so bsnes names will just have the profile name not the core name
{
name += $".{Emulator.Attributes().CoreName}";
}
name += $".{Emulator.Attributes().CoreName}";
// Bsnes profiles have incompatible savestates so save the profile name
if (Emulator is LibsnesCore bsnes)
@ -3448,11 +3432,6 @@ namespace BizHawk.Client.EmuHawk
name += $".{bsnes.CurrentProfile}";
}
if (Emulator.SystemId == "GBA")
{
name += $".{Emulator.Attributes().CoreName}";
}
if (MovieSession.Movie.IsActive())
{
name += $".{Path.GetFileNameWithoutExtension(MovieSession.Movie.Filename)}";