Changed: Cache the location of the current process.

Reloaded-Project · Apr 9, 2021 · 3ccd281 · 3ccd281
1 parent b3f4e31
commit 3ccd281
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/source/Reloaded.Mod.Loader/EntryPoint.cs b/source/Reloaded.Mod.Loader/EntryPoint.cs
@@ -63,7 +63,7 @@ private static void SetupLoader()
         private static void CreateHost()   => _server = new Host(_loader);
         private static unsafe void PerformPeOperations()
         {
-            _basicPeParser = new BasicPeParser(Process.GetCurrentProcess().MainModule.FileName);
+            _basicPeParser = new BasicPeParser(Environment.CurrentProcessLocation.Value);
 
             // Check for Steam DRM.
             DRMNotifier.PrintWarnings(_basicPeParser, _loader.Console);

diff --git a/source/Reloaded.Mod.Loader/Loader.cs b/source/Reloaded.Mod.Loader/Loader.cs
@@ -213,7 +213,7 @@ private HashSet<ModConfig> GetDependenciesForMods(IEnumerable<ModConfig> mods, I
         private IApplicationConfig FindThisApplication()
         {
             var configurations = ApplicationConfig.GetAllApplications(LoaderConfig.ApplicationConfigDirectory);
-            var fullPath       = NormalizePath(Path.GetFullPath(Process.GetCurrentProcess().MainModule.FileName));
+            var fullPath       = NormalizePath(Environment.CurrentProcessLocation.Value);
 
             foreach (var configuration in configurations)
             {

diff --git a/source/Reloaded.Mod.Shared/Environment.cs b/source/Reloaded.Mod.Shared/Environment.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Diagnostics;
+using System.IO;
 using System.Runtime.InteropServices;
 
 namespace Reloaded.Mod.Shared
@@ -10,6 +12,11 @@ public static class Environment
         /// </summary>
         public static bool IsWine { get; private set; }
 
+        /// <summary>
+        /// Gets the full path to the current process.
+        /// </summary>
+        public static Lazy<string> CurrentProcessLocation { get; private set; } = new Lazy<string>(() => Path.GetFullPath(Process.GetCurrentProcess().MainModule.FileName));
+
         static Environment()
         {
             var ntdll = GetModuleHandle("ntdll.dll");