From 103bf484b662ee0f5a89436c08382e25c14e4705 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Sun, 11 Jun 2017 15:09:27 -0500
Subject: [PATCH] fix racey crash during rewinder thread shutdown

---
 BizHawk.Client.Common/rewind/Rewinder.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Client.Common/rewind/Rewinder.cs b/BizHawk.Client.Common/rewind/Rewinder.cs
index 3f7bbe2704..69d3e8a2a6 100644
--- a/BizHawk.Client.Common/rewind/Rewinder.cs
+++ b/BizHawk.Client.Common/rewind/Rewinder.cs
@@ -80,8 +80,6 @@ namespace BizHawk.Client.Common
 
 		public void Uninitialize()
 		{
-			Clear();
-
 			if (_rewindThread != null)
 			{
 				_rewindThread.Dispose();
@@ -94,6 +92,8 @@ namespace BizHawk.Client.Common
 				_rewindBuffer = null;
 			}
 
+			Clear();
+
 			RewindEnabled = false;
 			RewindFrequency = 0;
 		}