From 0934b35a1e460d879046aa9b28d0afaac75ca969 Mon Sep 17 00:00:00 2001 From: kylethomson Date: Mon, 4 Jul 2011 22:24:48 +0000 Subject: [PATCH] Slight error with multi-track - it is during recording, not during playback. Otherwise, nice work zeromus, we have multitrack. --- BizHawk.MultiClient/MainForm.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 4ff0494e98..d97d6ca7bf 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -1350,13 +1350,14 @@ namespace BizHawk.MultiClient if (UserMovie.GetMovieMode() == MOVIEMODE.RECORD) { - UserMovie.LatchInputFromPlayer(); - UserMovie.CommitFrame(); - } - - if (UserMovie.GetMovieMode() == MOVIEMODE.PLAY && UserMovie.MultiTrack.IsActive) - { - UserMovie.LatchMultitrackPlayerInput(); + if (UserMovie.MultiTrack.IsActive) + { + UserMovie.LatchMultitrackPlayerInput(); + } + else + { + UserMovie.LatchInputFromPlayer(); + } UserMovie.CommitFrame(); }