From cfeccbb43d59ec7ca2b5ea3340e04dbb6d55f4c4 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 22 Sep 2016 10:49:37 -0700
Subject: [PATCH] [DATFromDir] Move file delete outside so it tries to catch
 everything

---
 SabreTools.Helper/Objects/DATFromDir.cs | 20 ++++++++++----------
 SabreTools.Helper/Tools/FileTools.cs    |  9 ++-------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/SabreTools.Helper/Objects/DATFromDir.cs b/SabreTools.Helper/Objects/DATFromDir.cs
index ea0c6e38..63437a04 100644
--- a/SabreTools.Helper/Objects/DATFromDir.cs
+++ b/SabreTools.Helper/Objects/DATFromDir.cs
@@ -291,18 +291,18 @@ namespace SabreTools
 				{
 					ProcessFile(newItem, newBasePath, "");
 				}
+			}
 
-				// Cue to delete the file if it's a copy
-				if (_copyFiles)
-				{
-					FileTools.DeleteFile(newItem);
-				}
+			// Cue to delete the file if it's a copy
+			if (_copyFiles && item != newItem)
+			{
+				FileTools.DeleteFile(newItem);
+			}
 
-				// Delete the sub temp directory
-				if (Directory.Exists(tempSubDir))
-				{
-					Directory.Delete(tempSubDir, true);
-				}
+			// Delete the sub temp directory
+			if (Directory.Exists(tempSubDir))
+			{
+				Directory.Delete(tempSubDir, true);
 			}
 		}
 
diff --git a/SabreTools.Helper/Tools/FileTools.cs b/SabreTools.Helper/Tools/FileTools.cs
index 6aa58ec0..2ea0682a 100644
--- a/SabreTools.Helper/Tools/FileTools.cs
+++ b/SabreTools.Helper/Tools/FileTools.cs
@@ -1,5 +1,4 @@
-//using Ionic.Zlib;
-using OCRC;
+using OCRC;
 using SharpCompress.Archive;
 using SharpCompress.Archive.SevenZip;
 using SharpCompress.Common;
@@ -9,7 +8,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
-using System.Security.AccessControl;
 using System.Security.Cryptography;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -1256,10 +1254,7 @@ namespace SabreTools.Helper
 					{
 						fi.Delete();
 					}
-					catch
-					{
-
-					}
+					catch { }
 				}
 			});
 		}