From a944125bea41e6f91e05fa956cc3e7663d47ecc9 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 14 Dec 2017 16:47:12 -0800
Subject: [PATCH] [DatFile] Cleanup

---
 SabreTools.Library/DatFiles/DatFile.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs
index c327a9b0..200c4473 100644
--- a/SabreTools.Library/DatFiles/DatFile.cs
+++ b/SabreTools.Library/DatFiles/DatFile.cs
@@ -518,6 +518,10 @@ namespace SabreTools.Library.DatFiles
 		{
 			get { return _sortedBy; }
 		}
+		public DedupeType MergedBy
+		{
+			get { return _mergedBy; }
+		}
 
 		// Data specific to the Miss DAT type
 		public bool UseGame
@@ -1401,6 +1405,9 @@ namespace SabreTools.Library.DatFiles
 				// Set the sorted type
 				_sortedBy = bucketBy;
 
+				// Reset the merged type since this might change the merge
+				_mergedBy = DedupeType.None;
+
 				// First do the initial sort of all of the roms inplace
 				List<string> oldkeys = Keys;
 				Parallel.ForEach(oldkeys, Globals.ParallelOptions, key =>
@@ -1554,9 +1561,9 @@ namespace SabreTools.Library.DatFiles
 		}
 
 		/// <summary>
-		/// Create a new DatFile from an existing one using the header values only
+		/// Create a new DatFile from an existing one
 		/// </summary>
-		/// <param name="df"></param>
+		/// <param name="datFile">DatFile to get the values from</param>
 		/// <param name="cloneHeader">True if only the header should be cloned (default), false if this should be a reference to another DatFile</param>
 		public DatFile(DatFile datFile, bool cloneHeader = true)
 		{
@@ -1577,7 +1584,7 @@ namespace SabreTools.Library.DatFiles
 		/// <summary>
 		/// Create a new DatFile from an existing DatHeader
 		/// </summary>
-		/// <param name="datHeader"></param>
+		/// <param name="datHeader">DatHeader to get the values from</param>
 		public DatFile(DatHeader datHeader)
 		{
 			_datHeader = (DatHeader)datHeader.Clone();