From 75b5ec9223fdbb0b9afce79814410c1e59c592aa Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 22 Apr 2012 13:38:12 +0000
Subject: [PATCH] redo revision 2168, this method also fixes the issue of
 loading a non-movie state while a movie is loaded, but also doesn't break the
 parsing of the savestate frame value in CheckTimeLines

---
 BizHawk.MultiClient/movie/Movie.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs
index 8852f013ce..cb890a2a92 100644
--- a/BizHawk.MultiClient/movie/Movie.cs
+++ b/BizHawk.MultiClient/movie/Movie.cs
@@ -562,9 +562,6 @@ namespace BizHawk.MultiClient
 			//This function will compare the movie data to the savestate movie data to see if they match
 			var reader = new StreamReader(path);
 
-			if (!IsStateFromAMovie(reader))
-				return false;
-
 			MovieLog l = new MovieLog();
 			string line;
 			string GUID;
@@ -572,6 +569,8 @@ namespace BizHawk.MultiClient
 			while (true)
 			{
 				line = reader.ReadLine();
+				if (line == null)
+					return false;
 				if (line.Trim() == "") continue;
 				else if (line.Contains("GUID"))
 				{