From ae233f623ed9972f5e8fcd080857170c2e30f5e4 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 2 Aug 2014 19:29:40 +0000
Subject: [PATCH] Fix Restart Movie/Play from Beginning

---
 BizHawk.Client.EmuHawk/MainForm.Movie.cs | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
index bc4512a304..6fdb1fcf80 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
@@ -67,34 +67,12 @@ namespace BizHawk.Client.EmuHawk
 			SetWindowText();
 		}
 
-		// Movie Refactor TODO: this needs to be considered, and adapated to the queue system
 		public void RestartMovie()
 		{
 			if (Global.MovieSession.Movie.IsActive)
 			{
-				LoadRom(CurrentlyOpenRom);
-				if (Global.MovieSession.Movie.StartsFromSavestate)
-				{
-					// TODO: why does this code exist twice??
-
-					if (Global.MovieSession.Movie.TextSavestate != null)
-					{
-						Global.Emulator.LoadStateText(new StringReader(Global.MovieSession.Movie.TextSavestate));
-					}
-					else
-					{
-						Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.BinarySavestate, false)));
-					}
-
-					//var state = Convert.FromBase64String(Global.MovieSession.Movie.SavestateBinaryBase64Blob);
-					//Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(state)));
-					Global.Emulator.ResetCounters();
-				}
-
-				Global.MovieSession.Movie.StartNewPlayback();
-				SetMainformMovieInfo();
+				GlobalWin.MainForm.StartNewMovie(Global.MovieSession.Movie, true);
 				GlobalWin.OSD.AddMessage("Replaying movie file in read-only mode");
-				Global.MovieSession.ReadOnly = true;
 			}
 		}