From f1a617b047a564184eef1e7f9ace6587136a7fbe Mon Sep 17 00:00:00 2001
From: feos <feos-theos@yandex.ru>
Date: Sat, 18 Feb 2017 20:54:59 +0300
Subject: [PATCH] tastudio: stop latching input in playback mode if new frames
 are generated addresses #801

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

diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index 9381bc8120..96fa1bbbbb 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -294,13 +294,16 @@ namespace BizHawk.Client.Common
 
 		private void HandleFrameLoopForRecordMode()
 		{
-			if (MultiTrack.IsActive)
+			if (!(Movie is TasMovie) || !Movie.IsPlaying) // tasmovie is appended via recording frames, but we don't want it to latch input outside its inetrnal recording mode
 			{
-				LatchMultitrackPlayerInput(Global.MovieInputSourceAdapter, Global.MultitrackRewiringAdapter);
-			}
-			else
-			{
-				LatchInputFromPlayer(Global.MovieInputSourceAdapter);
+				if (MultiTrack.IsActive)
+				{
+					LatchMultitrackPlayerInput(Global.MovieInputSourceAdapter, Global.MultitrackRewiringAdapter);
+				}
+				else
+				{
+					LatchInputFromPlayer(Global.MovieInputSourceAdapter);
+				}
 			}
 
 			// the movie session makes sure that the correct input has been read and merged to its MovieControllerAdapter;