From b9d9cf812f2bc11b62393f6448dfaa1b6b7eca8c Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Sun, 3 Jan 2021 14:22:25 -0800 Subject: [PATCH] Slightly different _mainInfo wording now... --- MPF.Library/DiscImageCreator/Parameters.cs | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/MPF.Library/DiscImageCreator/Parameters.cs b/MPF.Library/DiscImageCreator/Parameters.cs index d0db55d9..6cbbc612 100644 --- a/MPF.Library/DiscImageCreator/Parameters.cs +++ b/MPF.Library/DiscImageCreator/Parameters.cs @@ -2890,7 +2890,7 @@ namespace MPF.DiscImageCreator { // If we're in a new mainInfo, the location of the header changed string line = sr.ReadLine(); - if (line.StartsWith("========== OpCode")) + if (line.StartsWith("========== OpCode") || line.StartsWith("========== TOC (Binary)")) { // Seek to unscrambled data while (!(line = sr.ReadLine()).StartsWith("========== Check Volume Descriptor ==========")) ; @@ -3062,24 +3062,19 @@ namespace MPF.DiscImageCreator { // If we're in a new mainInfo, the location of the header changed string line = sr.ReadLine(); - if (line.StartsWith("========== OpCode")) + if (line.StartsWith("========== OpCode") || line.StartsWith("========== TOC (Binary)")) { - // Scrambled LBA0, instance 1 - while (!(line = sr.ReadLine()).StartsWith("========== LBA[000000, 0000000]: Main Channel ==========")) ; - - // Scrambled LBA0, instance 2 - while (!(line = sr.ReadLine()).StartsWith("========== LBA[000000, 0000000]: Main Channel ==========")) ; - - // Scrambled LBA0, instance 3 - while (!(line = sr.ReadLine()).StartsWith("========== LBA[000000, 0000000]: Main Channel ==========")) ; - - // Start of second OpCode area - while (!(line = sr.ReadLine()).StartsWith("========== OpCode")) ; + // Seek to unscrambled data + while (!(line = sr.ReadLine()).StartsWith("========== Check Volume Descriptor ==========")) ; // Read the next line so the search goes properly line = sr.ReadLine(); } + // Make sure we're in the area + if (!line.StartsWith("========== LBA")) + while (!(line = sr.ReadLine()).StartsWith("========== LBA")) ; + // Make sure we're in the right sector if (!line.StartsWith("========== LBA[000000, 0000000]: Main Channel ==========")) while (!(line = sr.ReadLine()).StartsWith("========== LBA[000000, 0000000]: Main Channel ==========")) ;