From 4a02a3efacad9b987f79457063aca43feff75ed8 Mon Sep 17 00:00:00 2001
From: Deterous <138427222+Deterous@users.noreply.github.com>
Date: Tue, 13 Feb 2024 01:30:50 +0900
Subject: [PATCH] Fix DIC log parsing for SS version (#649)

---
 CHANGELIST.md                                  |  1 +
 .../Modules/DiscImageCreator/Parameters.cs     | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index c2af4ea2..834c78d0 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -2,6 +2,7 @@
 
 - Remove .NET 6 from auto-builds
 - Make Redumper the default for new users
+- Fix DIC log parsing for SS version
 
 ### 3.1.0 (2024-02-06)
 
diff --git a/MPF.Core/Modules/DiscImageCreator/Parameters.cs b/MPF.Core/Modules/DiscImageCreator/Parameters.cs
index 59b35d38..4d223502 100644
--- a/MPF.Core/Modules/DiscImageCreator/Parameters.cs
+++ b/MPF.Core/Modules/DiscImageCreator/Parameters.cs
@@ -3720,6 +3720,9 @@ namespace MPF.Core.Modules.DiscImageCreator
             // This flag is needed because recent versions of DIC include security data twice
             bool foundSecuritySectors = false;
 
+            // SS version for all Kreon DIC dumps is v1
+            ssver = "01";
+
             try
             {
                 using var sr = File.OpenText(disc);
@@ -3729,11 +3732,13 @@ namespace MPF.Core.Modules.DiscImageCreator
                     if (line == null)
                         break;
 
-                    // Security Sector version
+                    // XGD version (1 = Xbox, 2 = Xbox360)
+                    /*
                     if (line.StartsWith("Version of challenge table"))
                     {
-                        ssver = line.Split(' ')[4]; // "Version of challenge table: <VER>"
+                        xgdver = line.Split(' ')[4]; // "Version of challenge table: <VER>"
                     }
+                    */
 
                     // Security Sector ranges
                     else if (line.StartsWith("Number of security sector ranges:") && !foundSecuritySectors)
@@ -3808,6 +3813,9 @@ namespace MPF.Core.Modules.DiscImageCreator
             // This flag is needed because recent versions of DIC include security data twice
             bool foundSecuritySectors = false;
 
+            // SS version for all Kreon DIC dumps is v1
+            ssver = "01";
+
             try
             {
                 using var sr = File.OpenText(disc);
@@ -3817,11 +3825,13 @@ namespace MPF.Core.Modules.DiscImageCreator
                     if (line == null)
                         break;
 
-                    // Security Sector version
+                    // XGD version (1 = Xbox, 2 = Xbox360)
+                    /*
                     if (line.StartsWith("Version of challenge table"))
                     {
-                        ssver = line.Split(' ')[4]; // "Version of challenge table: <VER>"
+                        xgdver = line.Split(' ')[4]; // "Version of challenge table: <VER>"
                     }
+                    */
 
                     // Security Sector ranges
                     else if (line.StartsWith("Number of security sector ranges:") && !foundSecuritySectors)