From 7b904b1715609c671c6b95ec66bffcd0a1fabaae Mon Sep 17 00:00:00 2001 From: Morilli <35152647+Morilli@users.noreply.github.com> Date: Thu, 2 Jan 2025 14:50:36 +0100 Subject: [PATCH] don't rely on PauseChanged in debugger this doesn't work anymore with 7c38810e9e56c5bad4a35d024e81b1e8ef391d27 and was questionable to begin with --- .../tools/Debugger/GenericDebugger.Disassembler.cs | 5 ----- .../tools/Debugger/GenericDebugger.IToolForm.cs | 7 +++++++ .../tools/Debugger/GenericDebugger.cs | 2 -- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs index 7d483be0a3..a2c16cc9f6 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs @@ -204,11 +204,6 @@ namespace BizHawk.Client.EmuHawk Clipboard.SetDataObject(blob.ToString()); } - private void OnPauseChanged(bool isPaused) - { - if (isPaused) FullUpdate(); - } - private void DisassemblerContextMenu_Opening(object sender, EventArgs e) { AddBreakpointContextMenuItem.Enabled = DisassemblerView.AnyRowsSelected; diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs index 12ab32d647..b7b1d3296d 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs @@ -111,5 +111,12 @@ namespace BizHawk.Client.EmuHawk EngageDebugger(); FullUpdate(); } + + protected override void GeneralUpdate() => FullUpdate(); + + protected override void UpdateAfter() + { + if (MainForm.EmulatorPaused) FullUpdate(); + } } } diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs index a668b5480a..a0cfff101b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs @@ -74,7 +74,6 @@ namespace BizHawk.Client.EmuHawk } _disassemblyLines.Clear(); - MainForm.OnPauseChanged += OnPauseChanged; CancelSeekBtn.Enabled = false; if (CanDisassemble) { @@ -149,7 +148,6 @@ namespace BizHawk.Client.EmuHawk private void DisengageDebugger() { BreakPointControl1.Shutdown(); - MainForm.OnPauseChanged -= OnPauseChanged; } public void DisableRegisterBox()