diff --git a/SabreTools.Helper/Tools/DatTools.cs b/SabreTools.Helper/Tools/DatTools.cs
index 706aad37..63628a58 100644
--- a/SabreTools.Helper/Tools/DatTools.cs
+++ b/SabreTools.Helper/Tools/DatTools.cs
@@ -1871,52 +1871,7 @@ namespace SabreTools.Helper
#region Converting and Updating
///
- /// Output user defined merge
- ///
- /// Output directory to write the DATs to
- /// List of inputs to write out from
- /// Main DatData to draw information from
- /// Dat headers used optionally
- /// Logging object for console and file output
- public static void MergeNoDiff(string outDir, Dat userData, List inputs, List datHeaders, Logger logger)
- {
- // If we're in SuperDAT mode, prefix all games with their respective DATs
- if (userData.Type == "SuperDAT")
- {
- List keys = userData.Files.Keys.ToList();
- foreach (string key in keys)
- {
- List newroms = new List();
- foreach (Rom rom in userData.Files[key])
- {
- Rom newrom = rom;
- string filename = inputs[newrom.Metadata.SystemID].Split('¬')[0];
- string rootpath = inputs[newrom.Metadata.SystemID].Split('¬')[1];
-
- rootpath += (rootpath == "" ? "" : Path.DirectorySeparatorChar.ToString());
- filename = filename.Remove(0, rootpath.Length);
- newrom.Machine.Name = Path.GetDirectoryName(filename) + Path.DirectorySeparatorChar
- + Path.GetFileNameWithoutExtension(filename) + Path.DirectorySeparatorChar
- + newrom.Machine.Name;
- newroms.Add(newrom);
- }
- userData.Files[key] = newroms;
- }
- }
-
- // Output a DAT only if there are roms
- if (userData.Files.Count != 0)
- {
- WriteDatfile(userData, outDir, logger);
- }
- }
-
- #endregion
-
- #region Converting and Updating (Parallel)
-
- ///
- /// Convert, update, and filter a DAT file (Parallel)
+ /// Convert, update, and filter a DAT file
///
/// Names of the input files and/or folders
/// User specified inputs contained in a DatData object
@@ -2433,6 +2388,47 @@ namespace SabreTools.Helper
logger.User("Outputting complete in " + DateTime.Now.Subtract(start).ToString(@"hh\:mm\:ss\.fffff"));
}
+ ///
+ /// Output user defined merge
+ ///
+ /// Output directory to write the DATs to
+ /// List of inputs to write out from
+ /// Main DatData to draw information from
+ /// Dat headers used optionally
+ /// Logging object for console and file output
+ public static void MergeNoDiff(string outDir, Dat userData, List inputs, List datHeaders, Logger logger)
+ {
+ // If we're in SuperDAT mode, prefix all games with their respective DATs
+ if (userData.Type == "SuperDAT")
+ {
+ List keys = userData.Files.Keys.ToList();
+ foreach (string key in keys)
+ {
+ List newroms = new List();
+ foreach (Rom rom in userData.Files[key])
+ {
+ Rom newrom = rom;
+ string filename = inputs[newrom.Metadata.SystemID].Split('¬')[0];
+ string rootpath = inputs[newrom.Metadata.SystemID].Split('¬')[1];
+
+ rootpath += (rootpath == "" ? "" : Path.DirectorySeparatorChar.ToString());
+ filename = filename.Remove(0, rootpath.Length);
+ newrom.Machine.Name = Path.GetDirectoryName(filename) + Path.DirectorySeparatorChar
+ + Path.GetFileNameWithoutExtension(filename) + Path.DirectorySeparatorChar
+ + newrom.Machine.Name;
+ newroms.Add(newrom);
+ }
+ userData.Files[key] = newroms;
+ }
+ }
+
+ // Output a DAT only if there are roms
+ if (userData.Files.Count != 0)
+ {
+ WriteDatfile(userData, outDir, logger);
+ }
+ }
+
#endregion
#region DAT Writing