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

Change merging because blank CRCs can lead to problems

Browse Source
This commit is contained in:
Matt Nadareski
2016-05-11 15:02:33 -07:00
parent 11632ca111
commit 5224b1dabe
1 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
SabreHelper/RomManipulation.cs
View File

@@ -504,7 +504,8 @@ namespace SabreTools.Helper
if (!(crc == "" && md5 == "" && sha1 == "")) if (!(crc == "" && md5 == "" && sha1 == ""))
{ {
// Get the new values to add // Get the new values to add
string key = crc + "-" + size; string key = size + "-" + crc;
RomData value = new RomData RomData value = new RomData
{ {
Game = tempname, Game = tempname,
@@ -576,19 +577,40 @@ namespace SabreTools.Helper
{ {
if (x.CRC == y.CRC) if (x.CRC == y.CRC)
{ {
if (x.SystemID == y.SystemID) // If the CRC is blank, use MD5 before SystemID
if (x.CRC == "")
{ {
if (x.SourceID == y.SourceID) if (x.MD5 == y.MD5)
{ {
if (x.MD5 == y.MD5) if (x.SystemID == y.SystemID)
{ {
return String.Compare(x.SHA1, y.SHA1); if (x.SourceID == y.SourceID)
{
return String.Compare(x.SHA1, y.SHA1);
}
return x.SourceID - y.SourceID;
} }
return String.Compare(x.MD5, y.MD5); return x.SystemID - y.SystemID;
} }
return x.SourceID - y.SourceID; return String.Compare(x.MD5, y.MD5);
} }
return x.SystemID - y.SystemID; else
{
if (x.SystemID == y.SystemID)
{
if (x.SourceID == y.SourceID)
{
if (x.MD5 == y.MD5)
{
return String.Compare(x.SHA1, y.SHA1);
}
return String.Compare(x.MD5, y.MD5);
}
return x.SourceID - y.SourceID;
}
return x.SystemID - y.SystemID;
}
} }
return String.Compare(x.CRC, y.CRC); return String.Compare(x.CRC, y.CRC);
} }