claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[RomManipulation] Add stipulation for blank or null lists

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-11 14:05:50 -07:00
parent 048aaa03fe
commit cfc82e3ec6
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SabreHelper/DatTools/RomManipulation.cs
View File

@@ -19,7 +19,7 @@ namespace SabreTools.Helper
{ {
try try
{ {
StreamReader sr = new StreamReader(File.OpenRead(filename)); StreamReader sr = File.OpenText(filename);
string first = sr.ReadLine(); string first = sr.ReadLine();
sr.Close(); sr.Close();
if (first.Contains("<") && first.Contains(">")) if (first.Contains("<") && first.Contains(">"))
@@ -1426,6 +1426,13 @@ namespace SabreTools.Helper
/// <returns>A List of RomData objects representing the merged roms</returns> /// <returns>A List of RomData objects representing the merged roms</returns>
public static List<RomData> Merge(List<RomData> inroms, Logger logger) public static List<RomData> Merge(List<RomData> inroms, Logger logger)
{ {
// Check for null or blank roms first
if (inroms == null || inroms.Count == 0)
{
return new List<RomData>();
}
// Create output list
List<RomData> outroms = new List<RomData>(); List<RomData> outroms = new List<RomData>();
// First sort the roms by size, crc, md5, sha1 (in order) // First sort the roms by size, crc, md5, sha1 (in order)