From ab598d8377ad2283d0cb49f806a52ae7c6cb71da Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Sun, 11 Jun 2023 00:57:42 -0400
Subject: [PATCH] Fix Redumper DAT/layer parsing

---
 CHANGELIST.md                      |  1 +
 MPF.Modules/Redumper/Parameters.cs | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index cfe09605..e84e4c15 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -65,6 +65,7 @@
 - Add TODO with notes to Redumper
 - Fix 2-layer DVD support in Redumper
 - Fix VSCode build
+- Fix Redumper DAT/layer parsing
 
 ### 2.5 (2023-03-12)
 
diff --git a/MPF.Modules/Redumper/Parameters.cs b/MPF.Modules/Redumper/Parameters.cs
index dd1f7a53..fb254f44 100644
--- a/MPF.Modules/Redumper/Parameters.cs
+++ b/MPF.Modules/Redumper/Parameters.cs
@@ -1173,7 +1173,10 @@ namespace MPF.Modules.Redumper
                     while (line.StartsWith("<rom"))
                     {
                         datString += line + "\n";
-                        line = sr.ReadLine().Trim();
+                        if (sr.EndOfStream)
+                            break;
+
+                        line = sr.ReadLine()?.Trim();
                     }
 
                     return datString.TrimEnd('\n');
@@ -1260,6 +1263,10 @@ namespace MPF.Modules.Redumper
                     {
                         string line = sr.ReadLine()?.Trim();
 
+                        // If we have a null line, just break
+                        if (line == null)
+                            break;
+
                         // Single-layer discs have no layerbreak
                         if (line.Contains("layers count: 1"))
                         {
@@ -1275,8 +1282,8 @@ namespace MPF.Modules.Redumper
                         }
                     }
 
-                    // If we get to the end, there's an issue
-                    return null;
+                    // Return the layerbreak, if possible
+                    return layerbreak;
                 }
                 catch
                 {