From 40a4cfe8d94a139e698b42d1e574c8dae145a224 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 21 Apr 2016 14:42:16 -0700 Subject: [PATCH] Make it have one less complex part --- DATabase/TrimMerge.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/DATabase/TrimMerge.cs b/DATabase/TrimMerge.cs index 1d8c13ee..f1a9c5cc 100644 --- a/DATabase/TrimMerge.cs +++ b/DATabase/TrimMerge.cs @@ -112,11 +112,12 @@ namespace SabreTools } // Now write the file out accordingly - Output.WriteToDat(RomManipulation.GetDatName(filename, _logger), RomManipulation.GetDatDescription(filename, _logger), - "", "", "", "", _forceunpack, !RomManipulation.IsXmlDat(filename), Path.GetDirectoryName(filename), outroms, _logger); + string datName = RomManipulation.GetDatName(filename, _logger); + string datDescription = RomManipulation.GetDatDescription(filename, _logger); + Output.WriteToDat(datName, datDescription, "", "", "", "", _forceunpack, !RomManipulation.IsXmlDat(filename), Path.GetDirectoryName(filename), outroms, _logger); // Remove the original file if different and inform the user - if (filename != RomManipulation.GetDatDescription(filename, _logger) + (RomManipulation.IsXmlDat(filename) ? ".xml" : ".dat")) + if (filename != datDescription + (RomManipulation.IsXmlDat(filename) ? ".xml" : ".dat")) { try {