diff --git a/MergeDAT/MergeDAT.cs b/MergeDAT/MergeDAT.cs index 8e24dc99..acf013a9 100644 --- a/MergeDAT/MergeDAT.cs +++ b/MergeDAT/MergeDAT.cs @@ -86,7 +86,7 @@ namespace SabreTools logger.Start(); // Output the title - Build.Start("DiffDat"); + Build.Start("MergeDAT"); List inputs = new List(); bool help = false, dedup = false, diff = false, forceunpack = false, old = false, log = false, noDate = false; diff --git a/SabreHelper/Build.cs b/SabreHelper/Build.cs index adc500b5..c852a4c5 100644 --- a/SabreHelper/Build.cs +++ b/SabreHelper/Build.cs @@ -162,7 +162,7 @@ Options: case "MergeDAT": Console.WriteLine(@"MergeDAT - Merge two or more DATs ----------------------------------------- -Usage: MergeDAT [options] [filename] ... +Usage: MergeDAT [options] [filename|dirname] ... Options: -h, -?, --help Show this help dialog diff --git a/SabreHelper/RomManipulation.cs b/SabreHelper/RomManipulation.cs index c4fb5e47..477e1227 100644 --- a/SabreHelper/RomManipulation.cs +++ b/SabreHelper/RomManipulation.cs @@ -203,7 +203,7 @@ namespace SabreTools.Helper } else if (child.Attributes["size"] != null) { - size = Int64.Parse(child.Attributes["size"].Value); + Int64.TryParse(child.Attributes["size"].Value, out size); } roms.Add(new RomData @@ -240,7 +240,7 @@ namespace SabreTools.Helper } else if (data.Attributes["size"] != null) { - size = Int64.Parse(data.Attributes["size"].Value); + Int64.TryParse(data.Attributes["size"].Value, out size); } roms.Add(new RomData