Catch exceptions on Disc meta XML file reading

addresses #29
UniqProject · Jan 21, 2023 · 61cc6c5 · 61cc6c5
1 parent 3dfa4a7
commit 61cc6c5
Showing 1 changed file with 20 additions and 10 deletions.
diff --git a/BDInfo/BDROM/BDROM.cs b/BDInfo/BDROM/BDROM.cs
@@ -410,17 +410,27 @@ public BDROM(
 
         private void ReadDiscTitle(StreamReader fileStream)
         {
-            XmlDocument xDoc = new XmlDocument();
-            xDoc.Load(fileStream);
-            var xNsMgr = new XmlNamespaceManager(xDoc.NameTable);
-            xNsMgr.AddNamespace("di", "urn:BDA:bdmv;discinfo");
-            var xNode = xDoc.DocumentElement?.SelectSingleNode("di:discinfo/di:title/di:name", xNsMgr);
-            DiscTitle = xNode?.InnerText;
-
-            if (!string.IsNullOrEmpty(DiscTitle) && DiscTitle.ToLowerInvariant() == "blu-ray")
+            try
+            {
+                XmlDocument xDoc = new XmlDocument();
+                xDoc.Load(fileStream);
+                var xNsMgr = new XmlNamespaceManager(xDoc.NameTable);
+                xNsMgr.AddNamespace("di", "urn:BDA:bdmv;discinfo");
+                var xNode = xDoc.DocumentElement?.SelectSingleNode("di:discinfo/di:title/di:name", xNsMgr);
+                DiscTitle = xNode?.InnerText;
+
+                if (!string.IsNullOrEmpty(DiscTitle) && DiscTitle.ToLowerInvariant() == "blu-ray")
+                    DiscTitle = null;
+            }
+            catch (Exception)
+            {
                 DiscTitle = null;
-
-            fileStream.Close();
+            }
+            finally 
+            {
+                fileStream.Close();
+            }
+
         }
 
         public void Scan()