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:
parent
1adec35f93
commit
75b5ec9223
|
@ -562,9 +562,6 @@ namespace BizHawk.MultiClient
|
||||||
//This function will compare the movie data to the savestate movie data to see if they match
|
//This function will compare the movie data to the savestate movie data to see if they match
|
||||||
var reader = new StreamReader(path);
|
var reader = new StreamReader(path);
|
||||||
|
|
||||||
if (!IsStateFromAMovie(reader))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
MovieLog l = new MovieLog();
|
MovieLog l = new MovieLog();
|
||||||
string line;
|
string line;
|
||||||
string GUID;
|
string GUID;
|
||||||
|
@ -572,6 +569,8 @@ namespace BizHawk.MultiClient
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
line = reader.ReadLine();
|
line = reader.ReadLine();
|
||||||
|
if (line == null)
|
||||||
|
return false;
|
||||||
if (line.Trim() == "") continue;
|
if (line.Trim() == "") continue;
|
||||||
else if (line.Contains("GUID"))
|
else if (line.Contains("GUID"))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue