From 4c6c1c26130950d6d5582905cf74a1e87028ea9b Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 24 Apr 2020 14:43:31 -0500
Subject: [PATCH] fix crash when loading a .tasproj in tasutdio fixes #1938

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

diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 2537756a59..1dbf18fdfe 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3922,13 +3922,13 @@ namespace BizHawk.Client.EmuHawk
 			StopAv();
 
 			CommitCoreSettingsToConfig();
+			Rewinder.Uninitialize();
+
 			if (MovieSession.Movie.IsActive()) // Note: this must be called after CommitCoreSettingsToConfig()
 			{
 				StopMovie();
 			}
 
-			Rewinder.Uninitialize();
-
 			if (Tools.IsLoaded<TraceLogger>())
 			{
 				Tools.Get<TraceLogger>().Restart();