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

cleanup ICycleTiming header value setting 

notably don't unset the ClockRate just because the current cycle count is invalid
This commit is contained in:
Morilli 2024-09-15 21:25:29 +02:00
parent ec0f761bd9
commit 09c57cf86e
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
View File

@ -51,19 +51,15 @@ namespace BizHawk.Client.Common
public void SetCycleValues() //TODO IEmulator should not be an instance prop of movies, it should be passed in to every call (i.e. from MovieService) --yoshi
{
// The saved cycle value will only be valid if the end of the movie has been emulated.
if (this.IsAtEnd())
if (this.IsAtEnd() && Emulator.AsCycleTiming() is { } cycleCore)
{
var cycleCore = Emulator.AsCycleTiming();
if (cycleCore != null)
{
Header[HeaderKeys.CycleCount] = cycleCore.CycleCount.ToString();
Header[HeaderKeys.ClockRate] = cycleCore.ClockRate.ToString(CultureInfo.InvariantCulture);
}
// legacy movies may incorrectly have no ClockRate header value set
Header[HeaderKeys.ClockRate] = cycleCore.ClockRate.ToString(NumberFormatInfo.InvariantInfo);
Header[HeaderKeys.CycleCount] = cycleCore.CycleCount.ToString();
}
else
{
Header.Remove(HeaderKeys.CycleCount);
Header.Remove(HeaderKeys.ClockRate);
Header.Remove(HeaderKeys.CycleCount); // don't allow invalid cycle count fields to stay set
}
}

4
src/BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Globalization;
using System.Windows.Forms;
using BizHawk.Client.Common;
@ -279,8 +280,7 @@ namespace BizHawk.Client.EmuHawk
if (Emulator.HasCycleTiming())
{
movie.HeaderEntries.Add(HeaderKeys.CycleCount, "0");
movie.HeaderEntries.Add(HeaderKeys.ClockRate, "0");
movie.HeaderEntries.Add(HeaderKeys.ClockRate, Emulator.AsCycleTiming().ClockRate.ToString(NumberFormatInfo.InvariantInfo));
}
}
}