From fdf6047f2128a72a9330b76dc13ad5a46e25fd82 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Sat, 23 Apr 2016 00:29:48 -0700
Subject: [PATCH] Minor logging and fixes

---
 DATabase/MergeDiff.cs          |  4 ++--
 SabreHelper/RomManipulation.cs | 18 +++++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/DATabase/MergeDiff.cs b/DATabase/MergeDiff.cs
index 76bd83b2..883d4ae3 100644
--- a/DATabase/MergeDiff.cs
+++ b/DATabase/MergeDiff.cs
@@ -75,9 +75,9 @@ namespace SabreTools
 		public bool Process()
 		{
 			// Check if there are enough inputs
-			if (_inputs.Count < 0)
+			if (_inputs.Count < 2)
 			{
-				_logger.Warning("At least inputs are required!");
+				_logger.Warning("At least 2 inputs are required!");
 				return false;
 			}
 
diff --git a/SabreHelper/RomManipulation.cs b/SabreHelper/RomManipulation.cs
index 07fce9f9..381b7b2e 100644
--- a/SabreHelper/RomManipulation.cs
+++ b/SabreHelper/RomManipulation.cs
@@ -36,21 +36,25 @@ namespace SabreTools.Helper
 		/// <returns>The XmlDocument representing the (possibly converted) file, null otherwise</returns>
 		public static XmlDocument GetXmlDocument(string filename, Logger logger)
 		{
+			logger.Log("Attempting to read file: " + filename);
+
+			// Check if file exists
+			if (!File.Exists(filename))
+			{
+				logger.Warning("File '" + filename + "' could not read from!");
+				return null;
+			}
+
 			XmlDocument doc = new XmlDocument();
-			string alltext = "";
-			string[] alllines;
 			try
 			{
-				alltext = File.ReadAllText(filename);
-				doc.LoadXml(alltext);
+				doc.LoadXml(File.ReadAllText(filename));
 			}
 			catch (XmlException)
 			{
 				try
 				{
-					alllines = File.ReadAllLines(filename);
-					alltext = Converters.ClrMameProToXML(alllines).ToString();
-					doc.LoadXml(alltext);
+					doc.LoadXml(Converters.ClrMameProToXML(File.ReadAllLines(filename)).ToString());
 				}
 				catch (Exception ex)
 				{