From d553395f3f46b62dfb8c221c39b0125dd2e071ef Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 27 Oct 2020 17:13:35 -0700 Subject: [PATCH] Reorder CDS path checks, change one to fit code --- BurnOutSharp/ProtectionType/CactusDataShield.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/BurnOutSharp/ProtectionType/CactusDataShield.cs b/BurnOutSharp/ProtectionType/CactusDataShield.cs index 9132ad50..0c197a05 100644 --- a/BurnOutSharp/ProtectionType/CactusDataShield.cs +++ b/BurnOutSharp/ProtectionType/CactusDataShield.cs @@ -32,11 +32,11 @@ namespace BurnOutSharp.ProtectionType { if (isDirectory) { - if (files.Any(f => Path.GetFileName(f).Equals("yucca.cds", StringComparison.OrdinalIgnoreCase)) - || files.Any(f => Path.GetFileName(f).Equals("wmmp.exe", StringComparison.OrdinalIgnoreCase)) + if (files.Any(f => Path.GetFileName(f).Equals("CACTUSPJ.exe", StringComparison.OrdinalIgnoreCase)) + || files.Any(f => Path.GetFileName(f).Equals("CDSPlayer.app", StringComparison.OrdinalIgnoreCase)) || files.Any(f => Path.GetFileName(f).Equals("PJSTREAM.DLL", StringComparison.OrdinalIgnoreCase)) - || files.Any(f => Path.GetFileName(f).Equals("CACTUSPJ.exe", StringComparison.OrdinalIgnoreCase)) - || files.Any(f => Path.GetFileName(f).Equals("CDSPlayer.app", StringComparison.OrdinalIgnoreCase))) + || files.Any(f => Path.GetFileName(f).Equals("wmmp.exe", StringComparison.OrdinalIgnoreCase)) + || files.Any(f => Path.GetExtension(f).Trim('.').Equals("cds", StringComparison.OrdinalIgnoreCase))) { string versionPath = files.FirstOrDefault(f => Path.GetFileName(f).Equals("version.txt", StringComparison.OrdinalIgnoreCase)); if (!string.IsNullOrWhiteSpace(versionPath)) @@ -51,11 +51,11 @@ namespace BurnOutSharp.ProtectionType } else { - if (Path.GetFileName(path).Equals("yucca.cds", StringComparison.OrdinalIgnoreCase) - || Path.GetFileName(path).Equals("wmmp.exe", StringComparison.OrdinalIgnoreCase) + if (Path.GetFileName(path).Equals("CACTUSPJ.exe", StringComparison.OrdinalIgnoreCase) + || Path.GetFileName(path).Equals("CDSPlayer.app", StringComparison.OrdinalIgnoreCase) || Path.GetFileName(path).Equals("PJSTREAM.DLL", StringComparison.OrdinalIgnoreCase) - || Path.GetFileName(path).Equals("CACTUSPJ.exe", StringComparison.OrdinalIgnoreCase) - || Path.GetFileName(path).Equals("CDSPlayer.app", StringComparison.OrdinalIgnoreCase)) + || Path.GetFileName(path).Equals("wmmp.exe", StringComparison.OrdinalIgnoreCase) + || Path.GetExtension(path).Trim('.').Equals("cds", StringComparison.OrdinalIgnoreCase)) { return "Cactus Data Shield 200"; }