From 5446a636ba4794816fa7caee41ed1709ddbbd454 Mon Sep 17 00:00:00 2001
From: "J.D. Purcell" <jdpurcell@gmail.com>
Date: Fri, 7 Apr 2017 22:57:01 -0400
Subject: [PATCH] Fix crash on exit when using XAudio2 with the debugger
 attached.

---
 BizHawk.Client.EmuHawk/Program.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/Program.cs b/BizHawk.Client.EmuHawk/Program.cs
index 0df0d3788d..1a26bc8c0c 100644
--- a/BizHawk.Client.EmuHawk/Program.cs
+++ b/BizHawk.Client.EmuHawk/Program.cs
@@ -225,6 +225,15 @@ namespace BizHawk.Client.EmuHawk
 						GlobalWin.ExitCode = mf.ProgramRunLoop();
 					}
 				}
+				if (GlobalWin.Sound != null)
+				{
+					GlobalWin.Sound.Dispose();
+					GlobalWin.Sound = null;
+				}
+				GlobalWin.GL.Dispose();
+#if WINDOWS
+				GamePad.CloseAll();
+#endif
 			}
 			else
 			{ // Display error message windows
@@ -288,7 +297,6 @@ namespace BizHawk.Client.EmuHawk
 				{
 					new ExceptionBox(e).ShowDialog();
 				}
-#if WINDOWS
 				finally
 				{
 					if (GlobalWin.Sound != null)
@@ -297,9 +305,10 @@ namespace BizHawk.Client.EmuHawk
 						GlobalWin.Sound = null;
 					}
 					GlobalWin.GL.Dispose();
+#if WINDOWS
 					GamePad.CloseAll();
-				}
 #endif
+				}
 			}
 
 			//cleanup: