From 415e3e3a140b2fb1b787012c9d454654fc641d2e Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 6 Mar 2015 00:48:31 +0000
Subject: [PATCH] MultiHawk - fix up frame counter when a movie is active

---
 BizHawk.Client.EmuHawk/MainForm.Movie.cs |  5 +++++
 BizHawk.Client.MultiHawk/Mainform.cs     | 19 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
index 05a23f0af9..c30d39ad66 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
@@ -14,6 +14,11 @@ namespace BizHawk.Client.EmuHawk
 {
 	partial class MainForm
 	{
+		public void StartNewMovie(string path, bool record)
+		{
+			StartNewMovie(MovieService.Get(Global.Config.RecentMovies.MostRecent), false);
+		}
+
 		public bool StartNewMovie(IMovie movie, bool record)
 		{
 			if (movie.IsActive)
diff --git a/BizHawk.Client.MultiHawk/Mainform.cs b/BizHawk.Client.MultiHawk/Mainform.cs
index a93ea93e21..fe34dd0725 100644
--- a/BizHawk.Client.MultiHawk/Mainform.cs
+++ b/BizHawk.Client.MultiHawk/Mainform.cs
@@ -1038,7 +1038,21 @@ namespace BizHawk.Client.MultiHawk
 		{
 			if (EmulatorWindows.Any())
 			{
-				FameStatusBarLabel.Text = EmulatorWindows.Master.Emulator.Frame.ToString();
+				string frame = EmulatorWindows.Master.Emulator.Frame.ToString();
+
+				if (Global.MovieSession.Movie.IsActive)
+				{
+					if (Global.MovieSession.Movie.IsFinished)
+					{
+						frame += string.Format(" / {0} (finished)", Global.MovieSession.Movie.FrameCount);
+					}
+					else if (Global.MovieSession.Movie.IsPlaying)
+					{
+						frame += string.Format(" / {0}", Global.MovieSession.Movie.FrameCount);
+					}
+				}
+
+				FameStatusBarLabel.Text = frame;
 			}
 		}
 
@@ -1069,12 +1083,14 @@ namespace BizHawk.Client.MultiHawk
 		{
 			new RecordMovie().ShowDialog();
 			UpdateMainText();
+			UpdateAfterFrameChanged();
 		}
 
 		private void PlayMovieMenuItem_Click(object sender, EventArgs e)
 		{
 			new PlayMovie().ShowDialog();
 			UpdateMainText();
+			UpdateAfterFrameChanged();
 		}
 
 		private void StopMovieMenuItem_Click(object sender, EventArgs e)
@@ -1082,6 +1098,7 @@ namespace BizHawk.Client.MultiHawk
 			Global.MovieSession.StopMovie(true);
 			SetMainformMovieInfo();
 			UpdateMainText();
+			UpdateAfterFrameChanged();
 			//UpdateStatusSlots(); // TODO
 		}