From df8da8bd46b0976d7a5e1fb830a9e9091d012b9f Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 10 Sep 2020 10:32:21 -0700 Subject: [PATCH] Fix PS1 copy protect output (fixes #222) --- DICUI.Library/DiscImageCreator/Parameters.cs | 7 ++++++- DICUI.Library/Utilities/DumpEnvironment.cs | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/DICUI.Library/DiscImageCreator/Parameters.cs b/DICUI.Library/DiscImageCreator/Parameters.cs index 50c7a938..81cb5367 100644 --- a/DICUI.Library/DiscImageCreator/Parameters.cs +++ b/DICUI.Library/DiscImageCreator/Parameters.cs @@ -1892,7 +1892,12 @@ namespace DICUI.DiscImageCreator info.CommonDiscInfo.EXEDateBuildDate = playstationDate; } - bool? psEdcStatus = GetPlayStationEDCStatus(basePath + ".img_EdcEcc.txt"); + bool? psEdcStatus = null; + if (File.Exists(basePath + ".img_EdcEcc.txt")) + psEdcStatus = GetPlayStationEDCStatus(basePath + ".img_EdcEcc.txt"); + else if (File.Exists(basePath + ".img_EccEdc.txt")) + psEdcStatus = GetPlayStationEDCStatus(basePath + ".img_EccEdc.txt"); + if (psEdcStatus == true) info.EDC.EDC = YesNo.Yes; else if (psEdcStatus == false) diff --git a/DICUI.Library/Utilities/DumpEnvironment.cs b/DICUI.Library/Utilities/DumpEnvironment.cs index d2acc33f..f91d287b 100644 --- a/DICUI.Library/Utilities/DumpEnvironment.cs +++ b/DICUI.Library/Utilities/DumpEnvironment.cs @@ -1071,7 +1071,7 @@ namespace DICUI.Utilities // EDC section if (info.CommonDiscInfo.System == KnownSystem.SonyPlayStation) { - output.Add("EDC:"); + output.Add(""); output.Add("EDC:"); AddIfExists(output, Template.PlayStationEDCField, info.EDC.EDC.LongName(), 1); } @@ -1094,7 +1094,9 @@ namespace DICUI.Utilities } // Copy Protection section - if (info.CopyProtection.Protection != null || info.EDC.EDC != YesNo.NULL) + if (info.CopyProtection.Protection != null + || info.CopyProtection.AntiModchip != YesNo.NULL + || info.CopyProtection.LibCrypt != YesNo.NULL) { output.Add(""); output.Add("Copy Protection:"); if (info.CommonDiscInfo.System == KnownSystem.SonyPlayStation)