Fix "starts from now" on SMB3 in quicknes, and who knows what other scenarios for savestate anchored movies

This commit is contained in:
adelikat 2014-05-18 01:00:35 +00:00
parent b4deb97587
commit 558fb67984
1 changed files with 15 additions and 2 deletions

View File

@ -104,7 +104,15 @@ namespace BizHawk.Client.Common
public void StartNewRecording()
{
Global.Emulator.ClearSaveRam();
// adelikat: ClearSaveRam shouldn't be here at all most likely, especially considering this is an implementation detail
// If Starting a new recording requires clearing sram it shoudl be done at a higher layer and not rely on all IMovies doing this
// Haven't removed it yet because I coudln't guarantee that power-on movies coudl live without it
// And the immediate fire is that Savestate movies are breaking
if (!Header.StartsFromSavestate)
{
Global.Emulator.ClearSaveRam();
}
_mode = Moviemode.Record;
if (Global.Config.EnableBackupMovies && MakeBackup && _log.Length > 0)
{
@ -117,7 +125,12 @@ namespace BizHawk.Client.Common
public void StartNewPlayback()
{
Global.Emulator.ClearSaveRam();
// See StartNewRecording for details as to why this savestate check is here
if (!Header.StartsFromSavestate)
{
Global.Emulator.ClearSaveRam();
}
_mode = Moviemode.Play;
}