From 06ecbe3cdae4a21964a09f6728bbae77b87d73fb Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Fri, 15 Dec 2017 13:40:15 -0800 Subject: [PATCH] [SabreTools, CHDFile] Fix sort issues --- SabreTools.Library/FileTypes/CHDFile.cs | 7 +++++++ SabreTools/SabreTools.cs | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/SabreTools.Library/FileTypes/CHDFile.cs b/SabreTools.Library/FileTypes/CHDFile.cs index 342d018a..8af08114 100644 --- a/SabreTools.Library/FileTypes/CHDFile.cs +++ b/SabreTools.Library/FileTypes/CHDFile.cs @@ -123,6 +123,13 @@ namespace SabreTools.Library.FileTypes // Read and verify the CHD signature m_signature = m_br.ReadBytes(8); + + // If no signature could be read, return null + if (m_signature == null || m_signature.Length == 0) + { + return null; + } + for(int i = 0; i < 8; i++) { if (m_signature[i] != Constants.CHDSignatureBytes[i]) diff --git a/SabreTools/SabreTools.cs b/SabreTools/SabreTools.cs index 0a55ae5d..90dde5bd 100644 --- a/SabreTools/SabreTools.cs +++ b/SabreTools/SabreTools.cs @@ -524,12 +524,6 @@ namespace SabreTools datHeader.Date = (string)feat.Value.GetValue(); break; case "dat": - if (!File.Exists((string)feat.Value.GetValue()) && !Directory.Exists((string)feat.Value.GetValue())) - { - Globals.Logger.Error("Must be a valid file or folder of DATs: {0}", (string)feat.Value.GetValue()); - Globals.Logger.Close(); - return; - } datfiles.AddRange((List)feat.Value.GetValue()); break; case "desc":