From e72aa11d5dbec19ec657d5cf4219e8c55f623e32 Mon Sep 17 00:00:00 2001
From: "J.D. Purcell" <jdpurcell@gmail.com>
Date: Mon, 8 May 2017 22:50:32 -0400
Subject: [PATCH] Fix rewind crash when cancelling out of archive file picker
 dialog.

---
 BizHawk.Client.EmuHawk/MainForm.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index bcdb60597b..feab8a234f 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3669,6 +3669,8 @@ namespace BizHawk.Client.EmuHawk
 				StopMovie(true);
 			}
 
+			Global.Rewinder.Uninitialize();
+
 			if (GlobalWin.Tools.IsLoaded<TraceLogger>())
 				GlobalWin.Tools.Get<TraceLogger>().Restart();
 
@@ -3700,7 +3702,6 @@ namespace BizHawk.Client.EmuHawk
 
 				GlobalWin.Tools.Restart();
 				RewireSound();
-				Global.Rewinder.Uninitialize();
 				Text = "BizHawk" + (VersionInfo.DeveloperBuild ? " (interim) " : string.Empty);
 				HandlePlatformMenus();
 				_stateSlots.Clear();