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

Play Movie - don't crash on headers with duplicate keys, don't throw an exception when movie files to parse

This commit is contained in:
adelikat 2014-04-13 23:18:45 +00:00
parent bca069325b
commit a6944c47d8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/movie/MovieHeader.cs
View File

@ -174,7 +174,7 @@ namespace BizHawk.Client.Common
BoardProperties.Add(boardSplit[0], boardSplit[1]); BoardProperties.Add(boardSplit[0], boardSplit[1]);
} }
} }
else if (HeaderKeys.Contains(splitLine[0])) else if (HeaderKeys.Contains(splitLine[0]) && !this.ContainsKey(splitLine[0]))
{ {
Add(splitLine[0], splitLine[1]); Add(splitLine[0], splitLine[1]);
} }

5
BizHawk.Client.EmuHawk/movie/PlayMovie.cs
View File

@ -136,9 +136,11 @@ namespace BizHawk.Client.EmuHawk
private void PreLoadMovieFile(HawkFile hf, bool force) private void PreLoadMovieFile(HawkFile hf, bool force)
{ {
var movie = new Movie(hf.CanonicalFullPath); var movie = new Movie(hf.CanonicalFullPath);
movie.PreLoadText(hf);
try try
{ {
movie.PreLoadText(hf);
// Don't do this from browse // Don't do this from browse
if (movie.Header[HeaderKeys.GAMENAME] == Global.Game.Name || if (movie.Header[HeaderKeys.GAMENAME] == Global.Game.Name ||
Global.Config.PlayMovie_MatchGameName == false || force) Global.Config.PlayMovie_MatchGameName == false || force)
@ -148,6 +150,7 @@ namespace BizHawk.Client.EmuHawk
} }
catch (Exception ex) catch (Exception ex)
{ {
// TODO: inform the user that a movie failed to parse in some way
Console.WriteLine(ex.Message); Console.WriteLine(ex.Message);
} }
} }