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

Fix savestating being possible after movie has finished

This commit is contained in:
Morilli 2024-07-10 21:03:59 +02:00
parent 662fd83f5e
commit e9d6716a33
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/BizHawk.Client.Common/savestates/SavestateFile.cs
View File

@ -1,4 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -91,13 +92,7 @@ namespace BizHawk.Client.Common
bs.PutLump(BinaryStateLump.Input, bs.PutLump(BinaryStateLump.Input,
tw => tw =>
{ {
// TODO: this should not happen and no exception should be thrown here. Debug.Assert(_movieSession.Movie.FrameCount >= _emulator.Frame);
// Just make this noisy for now until the issue is fixed.
if (_movieSession.Movie.FrameCount < _emulator.Frame)
{
throw new InvalidOperationException(
$"Tried to create a savestate at frame {_emulator.Frame}, but only got a log of length {_movieSession.Movie.FrameCount}!");
}
// this never should have been a core's responsibility // this never should have been a core's responsibility
tw.WriteLine("Frame {0}", _emulator.Frame); tw.WriteLine("Frame {0}", _emulator.Frame);
_movieSession.HandleSaveState(tw); _movieSession.HandleSaveState(tw);

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

@ -4331,6 +4331,12 @@ namespace BizHawk.Client.EmuHawk
return; return;
} }
if (MovieSession.Movie.IsFinished())
{
OSD.AddMessage("Cannot savestate after movie end!");
return;
}
try try
{ {
new SavestateFile(Emulator, MovieSession, MovieSession.UserBag).Create(path, Config.Savestates); new SavestateFile(Emulator, MovieSession, MovieSession.UserBag).Create(path, Config.Savestates);