From 659f99e4916a64a30c2d3eb2e563351c90e5d57d Mon Sep 17 00:00:00 2001 From: pointfeev Date: Fri, 25 Mar 2022 14:38:37 -0400 Subject: [PATCH] v3.4.1.1 - Fixed blocked games being displayed in the pre-scan selection tree --- CreamInstaller/CreamInstaller.csproj | 2 +- CreamInstaller/Forms/SelectForm.cs | 6 +++--- CreamInstaller/Program.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CreamInstaller/CreamInstaller.csproj b/CreamInstaller/CreamInstaller.csproj index a77f8d8..1802c78 100644 --- a/CreamInstaller/CreamInstaller.csproj +++ b/CreamInstaller/CreamInstaller.csproj @@ -5,7 +5,7 @@ True Resources\ini.ico true - 3.4.1.0 + 3.4.1.1 Resources\ini.ico LICENSE 2021, pointfeev (https://github.com/pointfeev) diff --git a/CreamInstaller/Forms/SelectForm.cs b/CreamInstaller/Forms/SelectForm.cs index 77a31da..9b87802 100644 --- a/CreamInstaller/Forms/SelectForm.cs +++ b/CreamInstaller/Forms/SelectForm.cs @@ -415,7 +415,7 @@ internal partial class SelectForm : CustomForm gameChoices.Add(("Paradox", "ParadoxLauncher", "Paradox Launcher", ProgramsToScan is not null && ProgramsToScan.Any(p => p.id == "ParadoxLauncher"))); if (Directory.Exists(SteamLibrary.InstallPath)) foreach (Tuple program in await SteamLibrary.GetGames()) - if (!Program.IsGameBlocked(program.Item1, program.Item5)) + if (!Program.IsGameBlocked(program.Item2, program.Item5)) gameChoices.Add(("Steam", program.Item1, program.Item2, ProgramsToScan is not null && ProgramsToScan.Any(p => p.id == program.Item1))); if (Directory.Exists(EpicLibrary.EpicManifestsPath)) foreach (Manifest manifest in await EpicLibrary.GetGames()) @@ -771,7 +771,7 @@ internal partial class SelectForm : CustomForm private void OnBlockProtectedGamesHelpButtonClicked(object sender, EventArgs e) { string blockedGames = ""; - foreach (string name in Program.ProtectedGameNames) + foreach (string name in Program.ProtectedGames) blockedGames += helpButtonListPrefix + name; string blockedDirectories = ""; foreach (string path in Program.ProtectedGameDirectories) @@ -783,7 +783,7 @@ internal partial class SelectForm : CustomForm form.Show(SystemIcons.Information, "Blocks the program from caching and displaying games protected by DLL checks," + "\nanti-cheats, or that are confirmed not to be working with CreamAPI or ScreamAPI." + - "\n\nBlocked game names:" + blockedGames + + "\n\nBlocked games:" + blockedGames + "\n\nBlocked game sub-directories:" + blockedDirectories + "\n\nBlocked game sub-directory exceptions (not blocked):" + blockedDirectoryExceptions, "OK", customFormText: "Block Protected Games"); diff --git a/CreamInstaller/Program.cs b/CreamInstaller/Program.cs index 19de3ab..ef0fcc6 100644 --- a/CreamInstaller/Program.cs +++ b/CreamInstaller/Program.cs @@ -22,14 +22,14 @@ internal static class Program internal static readonly string CurrentProcessFilePath = CurrentProcess.MainModule.FileName; internal static bool BlockProtectedGames = true; - internal static readonly string[] ProtectedGameNames = { "PAYDAY 2", "Call to Arms" }; // non-functioning CreamAPI/ScreamAPI or DLL detections + internal static readonly string[] ProtectedGames = { "PAYDAY 2", "Call to Arms" }; // non-functioning CreamAPI/ScreamAPI or DLL detections internal static readonly string[] ProtectedGameDirectories = { @"\EasyAntiCheat", @"\BattlEye" }; // DLL detections internal static readonly string[] ProtectedGameDirectoryExceptions = { "Arma 3" }; // Arma 3's BattlEye doesn't detect DLL changes? internal static bool IsGameBlocked(string name, string directory = null) { if (!BlockProtectedGames) return false; - if (ProtectedGameNames.Contains(name)) return true; + if (ProtectedGames.Contains(name)) return true; if (directory is not null && !ProtectedGameDirectoryExceptions.Contains(name)) foreach (string path in ProtectedGameDirectories) if (Directory.Exists(directory + path)) return true;