fix racey crash during rewinder thread shutdown

2017-06-11 15:09:27 -05:00 · 2017-06-11 15:09:27 -05:00 · 103bf484b6
parent d18a512db8
commit 103bf484b6
1 changed files with 2 additions and 2 deletions
--- 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;
 		}