From 2f8a59a219adb5371667e48242f6741945c33281 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 3 Jan 2015 03:27:17 +0000
Subject: [PATCH] When the "Pause" movie end option is selected, fix bug where
 unpausing keeps repausing the emulator, now it will pause on movie end, and
 advancing further will stop and close the movie

---
 BizHawk.Client.Common/movie/MovieSession.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index 5dc63b4a5c..9974976846 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -161,7 +161,14 @@ namespace BizHawk.Client.Common
 					Movie.SwitchToRecord();
 					break;
 				case MovieEndAction.Pause:
-					PauseCallback(); // TODO: one frame ago
+					if (Global.Emulator.Frame >= Movie.InputLogLength)
+					{
+						Movie.Stop();
+					}
+					else
+					{
+						PauseCallback();
+					}
 					break;
 				default:
 				case MovieEndAction.Finish: