claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MergeDiff] Add more catches for empty/null lists

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-11 19:08:02 -07:00
parent 5f8f88e3d1
commit 0fc2538508
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
DATabase/MergeDiff.cs
View File

@@ -390,26 +390,30 @@ namespace SabreTools
List<RomData> oldroms = DatTools.Merge(userData.Roms[key], _logger); List<RomData> oldroms = DatTools.Merge(userData.Roms[key], _logger);
List<RomData> newroms = new List<RomData>(); List<RomData> newroms = new List<RomData>();
foreach (RomData rom in oldroms) if (oldroms != null && oldroms.Count > 0)
{ {
if (rom.SystemID == j) foreach (RomData rom in oldroms)
{ {
if (diffData.Roms.ContainsKey(key)) if (rom.SystemID == j)
{ {
diffData.Roms[key].Add(rom); if (diffData.Roms.ContainsKey(key))
{
diffData.Roms[key].Add(rom);
}
else
{
List<RomData> tl = new List<RomData>();
tl.Add(rom);
diffData.Roms.Add(key, tl);
}
} }
else else
{ {
List<RomData> tl = new List<RomData>(); newroms.Add(rom);
tl.Add(rom);
diffData.Roms.Add(key, tl);
} }
} }
else
{
newroms.Add(rom);
}
} }
userData.Roms[key] = newroms; userData.Roms[key] = newroms;
} }