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

This commit is contained in:
adelikat 2012-04-22 13:38:12 +00:00
parent 1adec35f93
commit 75b5ec9223
1 changed files with 2 additions and 3 deletions

View File

@ -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"))
{