Fixes to how firmware is added and loaded from movies

This commit is contained in:
adelikat 2015-02-26 21:58:44 +00:00
parent 7624a92021
commit dd28c386de
2 changed files with 5 additions and 2 deletions

View File

@ -59,11 +59,14 @@ namespace BizHawk.Client.Common
var pair = line.Split(new[] { ' ' }, 2, StringSplitOptions.RemoveEmptyEntries); var pair = line.Split(new[] { ' ' }, 2, StringSplitOptions.RemoveEmptyEntries);
if (pair.Length > 1) if (pair.Length > 1)
{
if (!Header.ContainsKey(pair[0]))
{ {
Header.Add(pair[0], pair[1]); Header.Add(pair[0], pair[1]);
} }
} }
} }
}
}); });
if (bl.HasLump(BinaryStateLump.Comments)) if (bl.HasLump(BinaryStateLump.Comments))

View File

@ -226,7 +226,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
{ {
foreach (var firmware in Global.FirmwareManager.RecentlyServed) foreach (var firmware in Global.FirmwareManager.RecentlyServed)
{ {
var key = firmware.SystemId + " Firmware " + firmware.FirmwareId; var key = firmware.SystemId + "_Firmware_" + firmware.FirmwareId;
if (!movie.HeaderEntries.ContainsKey(key)) if (!movie.HeaderEntries.ContainsKey(key))
{ {