From 63e4eaef79da73d16735dc01776ee096e546a2f7 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Mon, 25 Jul 2011 01:47:02 +0000
Subject: [PATCH] handle user input vs MovieMode.FINISHED better

---
 BizHawk.MultiClient/MainForm.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 97869ad336..19ff85dd26 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -1440,13 +1440,7 @@ namespace BizHawk.MultiClient
 
 				MovieSession session = Global.MovieSession;
 
-				if (UserMovie.Mode == MOVIEMODE.FINISHED)
-				{
-					//todo - a better way of ending
-					StopMovie();
-				}
-
-				if (UserMovie.Mode != MOVIEMODE.INACTIVE)
+				if (UserMovie.Mode == MOVIEMODE.RECORD || UserMovie.Mode == MOVIEMODE.PLAY)
 				{
 					session.LatchInputFromLog();
 				}
@@ -1464,7 +1458,7 @@ namespace BizHawk.MultiClient
 					session.Movie.CommitFrame(Global.Emulator.Frame, Global.MovieInputSourceAdapter);
 				}
 
-				if (UserMovie.Mode == MOVIEMODE.INACTIVE)
+				if (UserMovie.Mode == MOVIEMODE.INACTIVE || UserMovie.Mode == MOVIEMODE.FINISHED)
 				{
 					session.LatchInputFromPlayer(Global.MovieInputSourceAdapter);
 				}