Avoid AssembliesOverride if not found.

BattletechModders · Jan 23, 2023 · ee043d6 · ee043d6
1 parent f45a6ca
commit ee043d6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/ModTekPreloader/Injector/AssemblyCache.cs b/ModTekPreloader/Injector/AssemblyCache.cs
@@ -16,10 +16,14 @@ internal AssemblyCache()
     {
         searchDirectories = new List<string>
         {
-            Paths.AssembliesOverrideDirectory,
             Paths.ModTekDirectory,
             Paths.ManagedDirectory
         };
+
+        if (Directory.Exists(Paths.AssembliesOverrideDirectory))
+        {
+            searchDirectories.Insert(0, Paths.AssembliesOverrideDirectory);
+        }
     }
 
     public AssemblyDefinition Resolve(AssemblyNameReference name)

diff --git a/ModTekPreloader/Loader/Preloader.cs b/ModTekPreloader/Loader/Preloader.cs
@@ -48,6 +48,11 @@ private static void PreloadAssembliesInjected()
 
     private static void PreloadAssembliesOverride()
     {
+        if (!Directory.Exists(Paths.AssembliesOverrideDirectory))
+        {
+            return;
+        }
+
         Logger.Main.Log($"Preloading override assemblies from `{Paths.GetRelativePath(Paths.AssembliesOverrideDirectory)}`:");
         foreach (var file in Directory.GetFiles(Paths.AssembliesOverrideDirectory, "*.dll").OrderBy(p => p))
         {