From e524f3e4e5d154f02642b1d128aa22e465550b79 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 30 Aug 2020 11:54:48 -0500 Subject: [PATCH 1/3] DeveloperBuild = false --- src/BizHawk.Common/VersionInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BizHawk.Common/VersionInfo.cs b/src/BizHawk.Common/VersionInfo.cs index 648bd4baf1..d5b4a5d8b1 100644 --- a/src/BizHawk.Common/VersionInfo.cs +++ b/src/BizHawk.Common/VersionInfo.cs @@ -9,7 +9,7 @@ namespace BizHawk.Common public const string MainVersion = "2.5.0"; // Use numbers only or the new version notification won't work public const string ReleaseDate = "August 30, 2020"; public const string HomePage = "http://tasvideos.org/BizHawk.html"; - public static readonly bool DeveloperBuild = true; + public static readonly bool DeveloperBuild = false; public static readonly string? CustomBuildString; From c1a113ce2497a8d5d8e174752f7e906ef2100ba7 Mon Sep 17 00:00:00 2001 From: nattthebear Date: Wed, 2 Sep 2020 11:07:39 -0400 Subject: [PATCH 2/3] fix NRE closes #2363 --- .../Computers/SinclairSpectrum/ZXSpectrum.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs index 714c696aa8..81fca75ae7 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs @@ -40,8 +40,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum var settings = lp.Settings ?? new ZXSpectrumSettings(); var syncSettings = lp.SyncSettings ?? new ZXSpectrumSyncSettings(); - PutSyncSettings(lp.SyncSettings); - PutSettings(lp.Settings); + PutSyncSettings(syncSettings); + PutSettings(settings); var joysticks = new List { From f3f5774bbb0db9449bae9cc000a2abea2b3fa2ba Mon Sep 17 00:00:00 2001 From: RetroEdit <30182911+RetroEdit@users.noreply.github.com> Date: Thu, 3 Sep 2020 18:11:37 +0000 Subject: [PATCH 3/3] Fix new bugs from painting during auto-restore fixes #2371 --- .../tools/TAStudio/TAStudio.Navigation.cs | 2 +- src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs index ebfdd928a0..17ba30d740 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs @@ -14,7 +14,7 @@ namespace BizHawk.Client.EmuHawk if (frame <= Emulator.Frame) { if ((MainForm.EmulatorPaused || !MainForm.IsSeeking) - && !CurrentTasMovie.LastPositionStable) + && !CurrentTasMovie.LastPositionStable && !_playbackInterrupted) { LastPositionFrame = Emulator.Frame; CurrentTasMovie.LastPositionStable = true; // until new frame is emulated diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 4610856d67..26073e0551 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -1018,6 +1018,13 @@ namespace BizHawk.Client.EmuHawk private void DoTriggeredAutoRestoreIfNeeded() { + // Disable the seek that could have been initiated when painting. + // This must done before DoAutoRestore, otherwise it would disable the auto-restore seek. + if (_playbackInterrupted) + { + MainForm.PauseOnFrame = null; + } + if (_triggerAutoRestore) { DoAutoRestore(); @@ -1025,11 +1032,10 @@ namespace BizHawk.Client.EmuHawk _triggerAutoRestore = false; _autoRestorePaused = null; } - + if (_playbackInterrupted) { MainForm.UnpauseEmulator(); - MainForm.PauseOnFrame = null; _playbackInterrupted = false; } }