From 7865fe298087ca6135d8eb8a739d1334d98f00cd Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Mon, 16 Nov 2020 17:37:49 -0500
Subject: [PATCH] Movies: pass SRAM to emulator before state is made

---
 src/BizHawk.Client.Common/movie/MovieSession.cs     | 1 -
 src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.Common/movie/MovieSession.cs b/src/BizHawk.Client.Common/movie/MovieSession.cs
index ec820034af..6c00b518fb 100644
--- a/src/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/src/BizHawk.Client.Common/movie/MovieSession.cs
@@ -243,7 +243,6 @@ namespace BizHawk.Client.Common
 			_queuedMovie = null;
 
 			Movie.ProcessSavestate(Movie.Emulator);
-			Movie.ProcessSram(Movie.Emulator);
 
 			if (recordMode)
 			{
diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
index 1a669b57eb..0a1f0db04a 100644
--- a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
+++ b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -50,6 +50,10 @@ namespace BizHawk.Client.Common
 			else
 			{
 				var ms = new MemoryStream();
+				if (StartsFromSaveRam && emulator.HasSaveRam())
+				{
+					emulator.AsSaveRam().StoreSaveRam(SaveRam);
+				}
 				emulator.AsStatable().SaveStateBinary(new BinaryWriter(ms));
 				TasStateManager.Engage(ms.ToArray());
 			}