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

tastudio: move greenzone writing/loading to the very end 

hopefully if it crashes during greenzone saving, other components won't die
This commit is contained in:
feos 2017-01-19 14:52:31 +03:00
parent d2642eaf59
commit 06b14d654b
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
View File

@ -36,11 +36,6 @@ namespace BizHawk.Client.Common
// TasProj extras // TasProj extras
bs.PutLump(BinaryStateLump.StateHistorySettings, tw => tw.WriteLine(StateManager.Settings.ToString())); bs.PutLump(BinaryStateLump.StateHistorySettings, tw => tw.WriteLine(StateManager.Settings.ToString()));
if (StateManager.Settings.SaveStateHistory)
{
bs.PutLump(BinaryStateLump.StateHistory, (BinaryWriter bw) => StateManager.Save(bw));
}
bs.PutLump(BinaryStateLump.LagLog, (BinaryWriter bw) => LagLog.Save(bw)); bs.PutLump(BinaryStateLump.LagLog, (BinaryWriter bw) => LagLog.Save(bw));
bs.PutLump(BinaryStateLump.Markers, tw => tw.WriteLine(Markers.ToString())); bs.PutLump(BinaryStateLump.Markers, tw => tw.WriteLine(Markers.ToString()));
@ -81,6 +76,11 @@ namespace BizHawk.Client.Common
} }
bs.PutLump(BinaryStateLump.Session, tw => tw.WriteLine(Session.ToString())); bs.PutLump(BinaryStateLump.Session, tw => tw.WriteLine(Session.ToString()));
if (StateManager.Settings.SaveStateHistory)
{
bs.PutLump(BinaryStateLump.StateHistory, (BinaryWriter bw) => StateManager.Save(bw));
}
} }
if (!backup) if (!backup)
@ -201,21 +201,6 @@ namespace BizHawk.Client.Common
StateManager.Settings.PopulateFromString(tr.ReadToEnd()); StateManager.Settings.PopulateFromString(tr.ReadToEnd());
}); });
if(!preload)
{
if (StateManager.Settings.SaveStateHistory)
{
bl.GetLump(BinaryStateLump.StateHistory, false, delegate(BinaryReader br, long length)
{
StateManager.Load(br);
});
}
// Movie should always have a state at frame 0.
if (!this.StartsFromSavestate && Global.Emulator.Frame == 0)
StateManager.Capture();
}
bl.GetLump(BinaryStateLump.Markers, false, delegate(TextReader tr) bl.GetLump(BinaryStateLump.Markers, false, delegate(TextReader tr)
{ {
string line; string line;
@ -280,6 +265,21 @@ namespace BizHawk.Client.Common
{ {
Session.PopulateFromString(tr.ReadToEnd()); Session.PopulateFromString(tr.ReadToEnd());
}); });
if (!preload)
{
if (StateManager.Settings.SaveStateHistory)
{
bl.GetLump(BinaryStateLump.StateHistory, false, delegate(BinaryReader br, long length)
{
StateManager.Load(br);
});
}
// Movie should always have a state at frame 0.
if (!this.StartsFromSavestate && Global.Emulator.Frame == 0)
StateManager.Capture();
}
} }
Changes = false; Changes = false;