diff --git a/GUI.NET/Debugger/frmDebugger.cs b/GUI.NET/Debugger/frmDebugger.cs index 466e5d12..24dd657e 100644 --- a/GUI.NET/Debugger/frmDebugger.cs +++ b/GUI.NET/Debugger/frmDebugger.cs @@ -533,6 +533,11 @@ namespace Mesen.GUI.Debugger protected override void OnFormClosed(FormClosedEventArgs e) { + tmrCdlRatios.Stop(); + foreach(Form frm in this._childForms.ToArray()) { + frm.Close(); + } + LabelManager.OnLabelUpdated -= LabelManager_OnLabelUpdated; BreakpointManager.BreakpointsChanged -= BreakpointManager_BreakpointsChanged; ctrlConsoleStatus.OnStateChanged -= ctrlConsoleStatus_OnStateChanged; @@ -553,10 +558,6 @@ namespace Mesen.GUI.Debugger SaveWorkspace(); - foreach(Form frm in this._childForms.ToArray()) { - frm.Close(); - } - base.OnFormClosed(e); }