From 8c3402c819fdca25cb35a53f12cc2e855e9d4766 Mon Sep 17 00:00:00 2001
From: Souryo <mesenemu@gmail.com>
Date: Sat, 6 May 2017 18:35:25 -0400
Subject: [PATCH] Debugger: Fixed potential deadlock when closing debugger

---
 GUI.NET/Debugger/frmDebugger.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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);
 		}