From de7d144e005c57c51f016dd16466e2c8032e267c Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Sun, 26 Nov 2017 21:00:49 -0800
Subject: [PATCH] [DatFile, SabreTools, Utilities] Fix DFD hashing issue

---
 SabreTools.Library/DatFiles/DatFile.cs | 3 ++-
 SabreTools.Library/Tools/Utilities.cs  | 8 ++++++++
 SabreTools/SabreTools.Inits.cs         | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs
index 3ae2d273..69ffd809 100644
--- a/SabreTools.Library/DatFiles/DatFile.cs
+++ b/SabreTools.Library/DatFiles/DatFile.cs
@@ -3332,7 +3332,8 @@ namespace SabreTools.Library.DatFiles
 			// If neither the name or description are defined, set them from the automatic values
 			else if (String.IsNullOrWhiteSpace(Name) && String.IsNullOrWhiteSpace(Description))
 			{
-				Name = basePath.Split(Path.DirectorySeparatorChar).Last();
+				string[] splitpath = basePath.Split(Path.DirectorySeparatorChar);
+				Name = String.IsNullOrWhiteSpace(splitpath.Last()) ? splitpath[splitpath.Length - 2] : splitpath.Last();
 				Description = Name + (bare ? "" : " (" + Date + ")");
 			}
 
diff --git a/SabreTools.Library/Tools/Utilities.cs b/SabreTools.Library/Tools/Utilities.cs
index dc1de0cd..3bddef1f 100644
--- a/SabreTools.Library/Tools/Utilities.cs
+++ b/SabreTools.Library/Tools/Utilities.cs
@@ -1560,6 +1560,10 @@ namespace SabreTools.Library.Tools
 					{
 						input.Seek(offset, SeekOrigin.Begin);
 					}
+					else
+					{
+						input.Seek(0, SeekOrigin.Begin);
+					}
 				}
 				catch (NotSupportedException)
 				{
@@ -1630,6 +1634,10 @@ namespace SabreTools.Library.Tools
 					{
 						input.Seek(offset, SeekOrigin.Begin);
 					}
+					else
+					{
+						input.Seek(0, SeekOrigin.Begin);
+					}
 				}
 				catch (NotSupportedException)
 				{
diff --git a/SabreTools/SabreTools.Inits.cs b/SabreTools/SabreTools.Inits.cs
index 96abd15f..ed526c92 100644
--- a/SabreTools/SabreTools.Inits.cs
+++ b/SabreTools/SabreTools.Inits.cs
@@ -139,7 +139,7 @@ namespace SabreTools
 					// If it was a success, write the DAT out
 					if (success)
 					{
-						datdata.WriteToFile(outDir);
+						datdata.Write(outDir);
 					}
 
 					// Otherwise, show the help