diff --git a/SabreTools.Library/Dats/Disk.cs b/SabreTools.Library/Dats/Disk.cs index d00d488d..50133a2c 100644 --- a/SabreTools.Library/Dats/Disk.cs +++ b/SabreTools.Library/Dats/Disk.cs @@ -128,11 +128,11 @@ namespace SabreTools.Library.Dats } // If we can determine that the disks have no non-empty hashes in common, we return false - if (!(String.IsNullOrEmpty(_md5) && String.IsNullOrEmpty(newOther.MD5)) - || !(String.IsNullOrEmpty(_sha1) && String.IsNullOrEmpty(newOther.SHA1)) - || !(String.IsNullOrEmpty(_sha256) && String.IsNullOrEmpty(newOther.SHA256)) - || !(String.IsNullOrEmpty(_sha384) && String.IsNullOrEmpty(newOther.SHA384)) - || !(String.IsNullOrEmpty(_sha512) && String.IsNullOrEmpty(newOther.SHA512))) + if ((String.IsNullOrEmpty(_md5) || String.IsNullOrEmpty(newOther.MD5)) + && (String.IsNullOrEmpty(_sha1) || String.IsNullOrEmpty(newOther.SHA1)) + && (String.IsNullOrEmpty(_sha256) || String.IsNullOrEmpty(newOther.SHA256)) + && (String.IsNullOrEmpty(_sha384) || String.IsNullOrEmpty(newOther.SHA384)) + && (String.IsNullOrEmpty(_sha512) || String.IsNullOrEmpty(newOther.SHA512))) { dupefound = false; } diff --git a/SabreTools.Library/Dats/Rom.cs b/SabreTools.Library/Dats/Rom.cs index 87db75ca..ab7783f1 100644 --- a/SabreTools.Library/Dats/Rom.cs +++ b/SabreTools.Library/Dats/Rom.cs @@ -159,13 +159,13 @@ namespace SabreTools.Library.Dats } // If we can determine that the roms have no non-empty hashes in common, we return false - if (!(String.IsNullOrEmpty(_crc) && String.IsNullOrEmpty(newOther.CRC)) - || !(String.IsNullOrEmpty(_md5) && String.IsNullOrEmpty(newOther.MD5)) - || !(String.IsNullOrEmpty(_sha1) && String.IsNullOrEmpty(newOther.SHA1)) - || !(String.IsNullOrEmpty(_sha256) && String.IsNullOrEmpty(newOther.SHA256)) - || !(String.IsNullOrEmpty(_sha384) && String.IsNullOrEmpty(newOther.SHA384)) - || !(String.IsNullOrEmpty(_sha512) && String.IsNullOrEmpty(newOther.SHA512))) - { + if ((String.IsNullOrEmpty(_crc) || String.IsNullOrEmpty(newOther.CRC)) + && (String.IsNullOrEmpty(_md5) || String.IsNullOrEmpty(newOther.MD5)) + && (String.IsNullOrEmpty(_sha1) || String.IsNullOrEmpty(newOther.SHA1)) + && (String.IsNullOrEmpty(_sha256) || String.IsNullOrEmpty(newOther.SHA256)) + && (String.IsNullOrEmpty(_sha384) || String.IsNullOrEmpty(newOther.SHA384)) + && (String.IsNullOrEmpty(_sha512) || String.IsNullOrEmpty(newOther.SHA512))) + { dupefound = false; } else if ((this.Size == newOther.Size)