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

Take advantage of new enum ordering

Browse Source
This commit is contained in:
Matt Nadareski
2016-05-11 10:57:00 -07:00
parent 889b265c4f
commit 2844bac565
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DATabase/MergeDiff.cs
View File

@@ -119,7 +119,7 @@ namespace SabreTools
foreach (RomData rom in temp)
{
if (rom.Dupe != DupeType.ExternalHash && rom.Dupe != DupeType.ExternalAll)
if (rom.Dupe < DupeType.ExternalHash)
{
if (diffed.ContainsKey(key))
{
@@ -178,7 +178,7 @@ namespace SabreTools
foreach (RomData rom in temp)
{
if (rom.Dupe == DupeType.ExternalHash || rom.Dupe == DupeType.ExternalAll)
if (rom.Dupe >= DupeType.ExternalHash)
{
if (duplicates.ContainsKey(key))
{

4
SabreHelper/RomManipulation.cs
View File

@@ -629,8 +629,8 @@ namespace SabreTools.Helper
last.MD5 = (last.MD5 == "" && rom.MD5 != "" ? rom.MD5 : last.MD5);
last.SHA1 = (last.SHA1 == "" && rom.SHA1 != "" ? rom.SHA1 : last.SHA1);
// If the duplicate is in the same system and dupe is not already set to External
if ((last.SystemID == rom.SystemID || last.SourceID == rom.SourceID) && last.Dupe != DupeType.ExternalHash)
// If the duplicate is in the same system and dupe is not already set to External*
if ((last.SystemID == rom.SystemID || last.SourceID == rom.SourceID) && last.Dupe < DupeType.ExternalHash)
{
if (last.Game == rom.Game && last.Name == rom.Name)
{