Make merging more robust

This commit is contained in:
Matt Nadareski
2016-05-03 23:59:32 -07:00
parent 455c5c25e1
commit 411115083d
4 changed files with 30 additions and 24 deletions

View File

@@ -154,7 +154,13 @@ namespace SabreTools.Helper
long count = 0;
foreach (List<RomData> roms in dict.Values)
{
foreach (RomData rom in roms)
List<RomData> newroms = roms;
if (merge)
{
newroms = RomManipulation.Merge(newroms);
}
foreach (RomData rom in newroms)
{
count++;
string key = rom.SystemID + "-" + rom.SourceID + "-" + rom.Game + "-" + rom.Name;
@@ -168,11 +174,6 @@ namespace SabreTools.Helper
temp.Add(rom);
sortable.Add(key, temp);
}
if (merge)
{
break;
}
}
}