From 2bf48e3c8668c32ecd5bb27f5a0f437bc93db619 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Sun, 8 Nov 2015 22:18:04 -0600
Subject: [PATCH] dont savestate at all if rewind is completely disabled

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

diff --git a/BizHawk.Client.Common/rewind/Rewinder.cs b/BizHawk.Client.Common/rewind/Rewinder.cs
index 438b2a44c8..6cacd80e55 100644
--- a/BizHawk.Client.Common/rewind/Rewinder.cs
+++ b/BizHawk.Client.Common/rewind/Rewinder.cs
@@ -58,9 +58,22 @@ namespace BizHawk.Client.Common
 			get { return _rewindFrequency; }
 		}
 
+		bool IsRewindEnabledAtAll
+		{
+			get
+			{
+				if (!Global.Config.RewindEnabledLarge && !Global.Config.RewindEnabledMedium && !Global.Config.RewindEnabledSmall)
+					return false;
+				else return true;
+			}
+		}
+
 		// TOOD: this should not be parameterless?! It is only possible due to passing a static context in
 		public void CaptureRewindState()
 		{
+			if (!IsRewindEnabledAtAll)
+				return;
+
 			if (Global.Emulator.HasSavestates())
 			{
 				if (_rewindImpossible)