From b0258ef3dbf0eb021e885093c5bcb7f7d1001747 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 21 Jun 2020 10:43:05 -0500
Subject: [PATCH] fix NRE when closing tastudio

---
 src/BizHawk.Client.EmuHawk/MainForm.cs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index bf53eb9ee7..d35a1ccc7d 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3903,16 +3903,20 @@ namespace BizHawk.Client.EmuHawk
 				CreateRewinder();
 			}
 
-			if (enabled)
+			// CreateRewinder doesn't necessarily create an instance of rewinder, still need to check null
+			if (Rewinder != null)
 			{
-				Rewinder.Resume();
-			}
-			else
-			{
-				Rewinder.Suspend();
-			}
+				if (enabled)
+				{
+					Rewinder.Resume();
+				}
+				else
+				{
+					Rewinder.Suspend();
+				}
 
-			AddOnScreenMessage($"Rewind {(enabled ? "enabled" : "suspended")}");
+				AddOnScreenMessage($"Rewind {(enabled ? "enabled" : "suspended")}");
+			}
 		}
 
 		public void DisableRewind()