From 26a2511701bd4ad63fdeb52d735a12e5216c8dd7 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 19 May 2016 13:37:05 -0700
Subject: [PATCH] Revert "Minor change to be fully compatible with SuperDAT
 output"

This reverts commit 8b43e2ec797bd0c7f73fb21ac95e0816610d8767.
---
 DATabase/MergeDiff.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/DATabase/MergeDiff.cs b/DATabase/MergeDiff.cs
index afc23ae5..dab2e2fe 100644
--- a/DATabase/MergeDiff.cs
+++ b/DATabase/MergeDiff.cs
@@ -114,11 +114,11 @@ namespace SabreTools
 				Date = _date,
 				Category = _cat,
 				Author = _author,
-				Type = (_superdat ? "SuperDAT" : ""),
 				ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None),
 				OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml),
 				MergeRoms = _dedup,
 				Roms = new Dictionary<string, List<RomData>>(),
+				Type = (_superdat ? "SuperDAT" : ""),
 			};
 			foreach (string input in _inputs)
 			{
@@ -142,7 +142,6 @@ namespace SabreTools
 					Date = _date,
 					Category = _cat,
 					Author = _author,
-					Type = (_superdat ? "SuperDAT" : ""),
 					ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None),
 					OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml),
 					MergeRoms = _dedup,
@@ -187,7 +186,6 @@ namespace SabreTools
 						Date = _date,
 						Category = _cat,
 						Author = _author,
-						Type = (_superdat ? "SuperDAT" : ""),
 						ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None),
 						OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml),
 						MergeRoms = _dedup,
@@ -227,7 +225,6 @@ namespace SabreTools
 					Date = _date,
 					Category = _cat,
 					Author = _author,
-					Type = (_superdat ? "SuperDAT" : ""),
 					ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None),
 					OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml),
 					MergeRoms = _dedup,
@@ -273,7 +270,6 @@ namespace SabreTools
 						Date = _date,
 						Category = _cat,
 						Author = _author,
-						Type = (_superdat ? "SuperDAT" : ""),
 						ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None),
 						OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml),
 						MergeRoms = _dedup,
@@ -286,7 +282,7 @@ namespace SabreTools
 						List<RomData> oldroms = RomManipulation.Merge(userData.Roms[key]);
 						List<RomData> newroms = new List<RomData>();
 
-						foreach (RomData rom in userData.Roms[key])
+						foreach (RomData rom in oldroms)
 						{
 							if (rom.SystemID == j)
 							{