From b77cdff0ccecaf47849cd5d7ceadaac9e0983275 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Mon, 29 Aug 2016 20:45:20 -0700
Subject: [PATCH] [SimpleSort] Fix equivalence

---
 SabreTools.Helper/Data/Structs.cs   | 6 ++----
 SabreTools.Helper/Tools/RomTools.cs | 1 +
 SimpleSort/SimpleSort.cs            | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/SabreTools.Helper/Data/Structs.cs b/SabreTools.Helper/Data/Structs.cs
index 0cc7f901..7a0e25a0 100644
--- a/SabreTools.Helper/Data/Structs.cs
+++ b/SabreTools.Helper/Data/Structs.cs
@@ -172,7 +172,7 @@ namespace SabreTools.Helper
 		{
 			bool equals = false;
 
-			if (!IsDisk &&
+			if (IsDisk &&
 					((String.IsNullOrEmpty(this.MD5) || String.IsNullOrEmpty(other.MD5)) || this.MD5 == other.MD5) &&
 					((String.IsNullOrEmpty(this.SHA1) || String.IsNullOrEmpty(other.SHA1)) || this.SHA1 == other.SHA1))
 			{
@@ -250,9 +250,7 @@ namespace SabreTools.Helper
 				dupefound = this.HashData.Equals(other.HashData, true);
 			}
 
-			return (this.Machine.Equals(other.Machine) &&
-				this.Name == other.Name &&
-				dupefound);
+			return dupefound;
 		}
 	}
 
diff --git a/SabreTools.Helper/Tools/RomTools.cs b/SabreTools.Helper/Tools/RomTools.cs
index 3632cddb..f495a079 100644
--- a/SabreTools.Helper/Tools/RomTools.cs
+++ b/SabreTools.Helper/Tools/RomTools.cs
@@ -128,6 +128,7 @@ namespace SabreTools.Helper
 			{
 				List<Rom> roms = datdata.Files[key];
 				List<Rom> left = new List<Rom>();
+
 				foreach (Rom rom in roms)
 				{
 					if (IsDuplicate(rom, lastrom, logger))
diff --git a/SimpleSort/SimpleSort.cs b/SimpleSort/SimpleSort.cs
index 46e983de..838fce01 100644
--- a/SimpleSort/SimpleSort.cs
+++ b/SimpleSort/SimpleSort.cs
@@ -772,7 +772,7 @@ namespace SabreTools
 									}
 									else
 									{
-										string archiveFileName = Path.Combine(_outdir, found.Machine + ".zip");
+										string archiveFileName = Path.Combine(_outdir, found.Machine.Name + ".zip");
 										FileTools.CopyFileBetweenManagedArchives(input, archiveFileName, rom.Name, found.Name, _logger);
 									}
 								}