From faa307bb6e32f2f58699d5bc6382c46a4ea38a5b Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Sat, 27 Jul 2013 22:43:08 +0000
Subject: [PATCH] fix a little bugaroo in new code

---
 BizHawk.MultiClient/Rewind.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/BizHawk.MultiClient/Rewind.cs b/BizHawk.MultiClient/Rewind.cs
index be23312ede..7fcedfd16c 100644
--- a/BizHawk.MultiClient/Rewind.cs
+++ b/BizHawk.MultiClient/Rewind.cs
@@ -89,10 +89,11 @@ namespace BizHawk.MultiClient
 			/// </summary>
 			public void PushMemoryStream(MemoryStream ms)
 			{
-				var buf = ms.ToArray();
-				long offset = Enqueue(0, buf.Length);
+				var buf = ms.GetBuffer();
+				int len = (int)ms.Length;
+				long offset = Enqueue(0, len);
 				mStream.Position = offset;
-				mStream.Write(buf, 0, buf.Length);
+				mStream.Write(buf, 0, len);
 			}
 
 			public MemoryStream PopMemoryStream()
@@ -330,7 +331,8 @@ namespace BizHawk.MultiClient
 					if (CurrentState[i] == LastState[i])
 					{
 						writer.Write((byte)(i - beginChangeSequence));
-						writer.Write((ushort)beginChangeSequence);
+						if(isSmall) writer.Write((ushort)beginChangeSequence);
+						else writer.Write(beginChangeSequence);
 						writer.Write(LastState, beginChangeSequence, i - beginChangeSequence);
 						inChangeSequence = false;
 					}