From 40bfe91238f80f67ddbc28a390969804b28512a5 Mon Sep 17 00:00:00 2001
From: jdpurcell <jdpurcell@gmail.com>
Date: Sat, 17 Jan 2015 20:53:01 +0000
Subject: [PATCH] Rewinder - small optimization to previous bugfix and rename
 misleading method name.

---
 BizHawk.Client.Common/rewind/Rewinder.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Client.Common/rewind/Rewinder.cs b/BizHawk.Client.Common/rewind/Rewinder.cs
index e100e912c8..37162f9b07 100644
--- a/BizHawk.Client.Common/rewind/Rewinder.cs
+++ b/BizHawk.Client.Common/rewind/Rewinder.cs
@@ -159,7 +159,7 @@ namespace BizHawk.Client.Common
 					return;
 				}
 
-				RewindDelta();
+				RewindOne();
 			}
 		}
 
@@ -334,7 +334,7 @@ namespace BizHawk.Client.Common
 			UpdateLastState(currentState);
 		}
 
-		private void RewindDelta()
+		private void RewindOne()
 		{
 			if (!Global.Emulator.HasSavestates()) return;
 
@@ -344,7 +344,11 @@ namespace BizHawk.Client.Common
 			var fullstate = reader.ReadBoolean();
 			if (fullstate)
 			{
-				UpdateLastState(buf, 1, buf.Length - 1);
+				if (_rewindDeltaEnable)
+				{
+					UpdateLastState(buf, 1, buf.Length - 1);
+				}
+
 				Global.Emulator.AsStatable().LoadStateBinary(reader);
 			}
 			else