ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

-Discovered that the infinite loop in ImportZMV is the result of RLE reading in a huge and impossible frame number. 

-Made ImportZMV only work on interim versions. I don't think I will be able to get it done in time for 1.1.0.
This commit is contained in:
brandman211 2012-09-21 07:33:34 +00:00
parent 708b98b4b8
commit 2d0d57f81d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.MultiClient/movie/MovieImport.cs
View File

@ -64,6 +64,8 @@ namespace BizHawk.MultiClient
m = ImportVMV(path, out errorMsg, out warningMsg); m = ImportVMV(path, out errorMsg, out warningMsg);
break; break;
case ".ZMV": case ".ZMV":
if (!Global.MainForm.INTERIM)
return m;
m = ImportZMV(path, out errorMsg, out warningMsg); m = ImportZMV(path, out errorMsg, out warningMsg);
break; break;
} }
@ -1761,7 +1763,6 @@ namespace BizHawk.MultiClient
); );
} }
else if (warningMsg != "") else if (warningMsg != "")
// TODO: Move this to the controllers used check.
warningMsg = "Controller " + player + " not supported."; warningMsg = "Controller " + player + " not supported.";
} }
// The controller data contains <number_of_frames + 1> frames. // The controller data contains <number_of_frames + 1> frames.
@ -2452,7 +2453,6 @@ namespace BizHawk.MultiClient
); );
} }
else if (warningMsg != "") else if (warningMsg != "")
// TODO: Move this to the controllers used check.
warningMsg = "Controller " + player + " not supported."; warningMsg = "Controller " + player + " not supported.";
} }
} }