From 4c5728dedb36e14cef9b224bd43827997eff05e1 Mon Sep 17 00:00:00 2001 From: Asnivor Date: Tue, 8 Jan 2019 12:48:40 +0000 Subject: [PATCH] EmuHawk: Deterministic Emulation Revert --- BizHawk.Client.EmuHawk/MainForm.cs | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 6693e69650..78a1fa21bd 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -3589,23 +3589,12 @@ namespace BizHawk.Client.EmuHawk } try - { - bool deterministic; - - if (args.Deterministic == null) - { - // movies should require deterministic emulation in ALL cases - // if the core is managing its own DE through SyncSettings a 'deterministic' bool can be passed into the core's constructor - // it is then up to the core itself to override its own local DeterministicEmulation setting - // if a movie is *not* queued then make this false (this is needed for mGBA logic and is how things were working before I changed them -Asni) - deterministic = Global.MovieSession.QueuedMovie != null; - } - else - { - // a value was actually supplied somehow - use this - deterministic = args.Deterministic.Value; - } - + { + // movies should require deterministic emulation in ALL cases + // if the core is managing its own DE through SyncSettings a 'deterministic' bool can be passed into the core's constructor + // it is then up to the core itself to override its own local DeterministicEmulation setting + bool deterministic = args.Deterministic ?? Global.MovieSession.QueuedMovie != null; + if (!GlobalWin.Tools.AskSave()) { return false;