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

Revert "Experimental flip of values"

Browse Source 
This reverts commit 1b3cbf6796.
This commit is contained in:
Matt Nadareski
2016-05-13 16:17:03 -07:00
parent 1b3cbf6796
commit 6f1f65aedb
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
SabreHelper/RomManipulation.cs
View File

@@ -574,18 +574,18 @@ namespace SabreTools.Helper
inroms.Sort(delegate (RomData x, RomData y) inroms.Sort(delegate (RomData x, RomData y)
{ {
if (x.Size == y.Size) if (x.Size == y.Size)
{
if (x.SHA1 == y.SHA1)
{
// If the SHA1 is blank, use MD5 before SystemID
if (x.SHA1 == "")
{
if (x.MD5 == y.MD5)
{
// If the MD5 is blank, use CRC before SystemID
if (x.MD5 == "")
{ {
if (x.CRC == y.CRC) if (x.CRC == y.CRC)
{
// If the CRC is blank, use MD5 before SystemID
if (x.CRC == "")
{
if (x.MD5 == y.MD5)
{
// If the MD5 is blank, use SHA1 before SystemID
if (x.MD5 == "")
{
if (x.SHA1 == y.SHA1)
{ {
if (x.SystemID == y.SystemID) if (x.SystemID == y.SystemID)
{ {
@@ -593,7 +593,7 @@ namespace SabreTools.Helper
} }
return x.SystemID - y.SystemID; return x.SystemID - y.SystemID;
} }
return String.Compare(x.CRC, y.CRC); return String.Compare(x.SHA1, y.SHA1);
} }
else else
{ {
@@ -601,7 +601,7 @@ namespace SabreTools.Helper
{ {
if (x.SourceID == y.SourceID) if (x.SourceID == y.SourceID)
{ {
return String.Compare(x.CRC, y.CRC); return String.Compare(x.SHA1, y.SHA1);
} }
return x.SourceID - y.SourceID; return x.SourceID - y.SourceID;
} }
@@ -618,7 +618,7 @@ namespace SabreTools.Helper
{ {
if (x.MD5 == y.MD5) if (x.MD5 == y.MD5)
{ {
return String.Compare(x.CRC, y.CRC); return String.Compare(x.SHA1, y.SHA1);
} }
return String.Compare(x.MD5, y.MD5); return String.Compare(x.MD5, y.MD5);
} }
@@ -626,8 +626,9 @@ namespace SabreTools.Helper
} }
return x.SystemID - y.SystemID; return x.SystemID - y.SystemID;
} }
} }
return String.Compare(x.SHA1, y.SHA1); return String.Compare(x.CRC, y.CRC);
} }
return (int)(x.Size - y.Size); return (int)(x.Size - y.Size);
}); });