From 9d053eac4e94a942d869bfc96e6caebb79ba4106 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 17 Aug 2014 16:29:39 +0000
Subject: [PATCH] Fix multitrack recording

---
 BizHawk.Client.Common/movie/MovieSession.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index dfd4a9a74e..92c1fc07cc 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -113,13 +113,15 @@ namespace BizHawk.Client.Common
 				{
 					rewiredSource.PlayerTargetMask = unchecked((int)0xFFFFFFFF);
 				}
-			}
-			else
-			{
-				rewiredSource.PlayerSource = -1;
-			}
 
-			MovieControllerAdapter.LatchPlayerFromSource(rewiredSource, MultiTrack.CurrentPlayer);
+				if (Movie.InputLogLength > Global.Emulator.Frame)
+				{
+					var input = Movie.GetInputState(Global.Emulator.Frame);
+					MovieControllerAdapter.LatchFromSource(input);
+				}
+
+				MovieControllerAdapter.LatchPlayerFromSource(rewiredSource, MultiTrack.CurrentPlayer);
+			}
 		}
 
 		public void LatchInputFromPlayer(IController source)