From cfc82e3ec67e6464a2dd87d7f2a36f45f9dc9164 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Sat, 11 Jun 2016 14:05:50 -0700
Subject: [PATCH] [RomManipulation] Add stipulation for blank or null lists

---
 SabreHelper/DatTools/RomManipulation.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/SabreHelper/DatTools/RomManipulation.cs b/SabreHelper/DatTools/RomManipulation.cs
index 8858f8a7..105b9834 100644
--- a/SabreHelper/DatTools/RomManipulation.cs
+++ b/SabreHelper/DatTools/RomManipulation.cs
@@ -19,7 +19,7 @@ namespace SabreTools.Helper
 		{
 			try
 			{
-				StreamReader sr = new StreamReader(File.OpenRead(filename));
+				StreamReader sr = File.OpenText(filename);
 				string first = sr.ReadLine();
 				sr.Close();
 				if (first.Contains("<") && first.Contains(">"))
@@ -1426,6 +1426,13 @@ namespace SabreTools.Helper
 		/// <returns>A List of RomData objects representing the merged roms</returns>
 		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>();
 
 			// First sort the roms by size, crc, md5, sha1 (in order)