From 9d538d3b2ad67dcafdb084ee36d76ddcd24a6891 Mon Sep 17 00:00:00 2001 From: goaaats Date: Fri, 3 Jun 2022 17:56:40 +0200 Subject: [PATCH] chore: always ignore default if env vars are predefined --- Dalamud.Injector/EntryPoint.cs | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Dalamud.Injector/EntryPoint.cs b/Dalamud.Injector/EntryPoint.cs index a905b437f..c02ae7ea1 100644 --- a/Dalamud.Injector/EntryPoint.cs +++ b/Dalamud.Injector/EntryPoint.cs @@ -55,14 +55,9 @@ namespace Dalamud.Injector } // Set boot defaults - var prevFixList = Environment.GetEnvironmentVariable("DALAMUD_GAMEFIX_LIST"); - if (string.IsNullOrWhiteSpace(prevFixList)) - { - Environment.SetEnvironmentVariable("DALAMUD_GAMEFIX_LIST", "prevent_devicechange_crashes,disable_game_openprocess_access_check,redirect_openprocess"); - } - - Environment.SetEnvironmentVariable("DALAMUD_DOTNET_OPENPROCESS_HOOKMODE", "0"); - Environment.SetEnvironmentVariable("DALAMUD_UNHOOK_DLLS", "kernel32.dll,ntdll.dll,user32.dll"); + SetEnvDefaultIfNotExist("DALAMUD_GAMEFIX_LIST", "prevent_devicechange_crashes,disable_game_openprocess_access_check,redirect_openprocess"); + SetEnvDefaultIfNotExist("DALAMUD_DOTNET_OPENPROCESS_HOOKMODE", "0"); + SetEnvDefaultIfNotExist("DALAMUD_UNHOOK_DLLS", "kernel32.dll,ntdll.dll,user32.dll"); DalamudStartInfo startInfo = null; if (args.Count == 1) @@ -111,6 +106,15 @@ namespace Dalamud.Injector } } + private static void SetEnvDefaultIfNotExist(string name, string value) + { + var prevValue = Environment.GetEnvironmentVariable(name); + if (string.IsNullOrWhiteSpace(prevValue)) + { + Environment.SetEnvironmentVariable(name, value); + } + } + private static string GetLogPath(string filename) { var baseDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);