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

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

diff --git a/DATabase/MergeDiff.cs b/DATabase/MergeDiff.cs
index dab2e2fe..afc23ae5 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,6 +142,7 @@ 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,
@@ -186,6 +187,7 @@ 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,
@@ -225,6 +227,7 @@ 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,
@@ -270,6 +273,7 @@ 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,
@@ -282,7 +286,7 @@ namespace SabreTools
 						List<RomData> oldroms = RomManipulation.Merge(userData.Roms[key]);
 						List<RomData> newroms = new List<RomData>();
 
-						foreach (RomData rom in oldroms)
+						foreach (RomData rom in userData.Roms[key])
 						{
 							if (rom.SystemID == j)
 							{