ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tastudio: stop latching input in playback mode if new frames are generated 

addresses #801
This commit is contained in:
feos 2017-02-18 20:54:59 +03:00
parent e7178297c8
commit f1a617b047
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -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;