From 1043df063751766e780a853f4a02ba4ef8a844a1 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Fri, 30 Sep 2016 12:11:28 -0700 Subject: [PATCH] Revert "[DatFile] Make the process smoother for parsing" This reverts commit 4e956754c206cd4db49f46d3abfbd7e2f8b90e4f. --- SabreTools.Helper/Objects/Dat/DatFile.cs | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/SabreTools.Helper/Objects/Dat/DatFile.cs b/SabreTools.Helper/Objects/Dat/DatFile.cs index 447a7a3e..869234c5 100644 --- a/SabreTools.Helper/Objects/Dat/DatFile.cs +++ b/SabreTools.Helper/Objects/Dat/DatFile.cs @@ -1221,7 +1221,6 @@ namespace SabreTools.Helper case OutputFormat.OfflineList: case OutputFormat.SabreDat: case OutputFormat.SoftwareList: - case OutputFormat.Xml: ParseXML(filename, sysid, srcid, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, itemStatus, trim, single, root, logger, keep, clean, softlist); break; case OutputFormat.RedumpMD5: @@ -1236,6 +1235,9 @@ namespace SabreTools.Helper case OutputFormat.RomCenter: ParseRC(filename, sysid, srcid, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, itemStatus, trim, single, root, logger, clean); break; + case OutputFormat.Xml: + ParseXMLString(filename, sysid, srcid, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, itemStatus, trim, single, root, logger, keep, clean, softlist); + break; default: return; } @@ -2239,19 +2241,6 @@ namespace SabreTools.Helper return; } - // Check if the input has invalid characters. If it does, then close the reader and use the string version - try - { - XElement x = XElement.Load(xtr, LoadOptions.None); - x = null; - } - catch - { - xtr.Dispose(); - ParseXMLString(filename, sysid, srcid, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, itemStatus, trim, single, root, logger, keep, clean, softlist); - return; - } - // Otherwise, read the file to the end try {