From 772737f57943f4052bf2415c805438f95e04ab79 Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Sun, 4 Sep 2011 19:06:18 +0000
Subject: [PATCH] PlayMovieFromBeginning() - if movie starts from savestate,
 load the savestate!

---
 BizHawk.MultiClient/MainForm.Movie.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/BizHawk.MultiClient/MainForm.Movie.cs b/BizHawk.MultiClient/MainForm.Movie.cs
index af755466de..23fb771c78 100644
--- a/BizHawk.MultiClient/MainForm.Movie.cs
+++ b/BizHawk.MultiClient/MainForm.Movie.cs
@@ -87,6 +87,11 @@ namespace BizHawk.MultiClient
 			if (Global.MovieSession.Movie.Mode != MOVIEMODE.INACTIVE)
 			{
 				LoadRom(CurrentlyOpenRom);
+				if (Global.MovieSession.Movie.StartsFromSavestate)
+				{
+					LoadStateFile(Global.MovieSession.Movie.Filename, Path.GetFileName(Global.MovieSession.Movie.Filename));
+					Global.Emulator.ResetFrameCounter();
+				}
 				Global.MovieSession.Movie.StartPlayback();
 				SetMainformMovieInfo();
 			}