From 5384dc3028a6f1d6560bef85325d26000f356316 Mon Sep 17 00:00:00 2001 From: Anairkoen Schno Date: Sun, 11 Aug 2019 17:18:09 -0500 Subject: [PATCH] Updated CecilLibLoader to reflect newer main lib loader --- IPA.Loader/Loader/LibLoader.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/IPA.Loader/Loader/LibLoader.cs b/IPA.Loader/Loader/LibLoader.cs index dab45cff..58dbc6d4 100644 --- a/IPA.Loader/Loader/LibLoader.cs +++ b/IPA.Loader/Loader/LibLoader.cs @@ -13,14 +13,15 @@ namespace IPA.Loader { LibLoader.SetupAssemblyFilenames(); - var testFile = $"{name.Name}.{name.Version}.dll"; - - if (LibLoader.FilenameLocations.TryGetValue(testFile, out string path)) + if (LibLoader.FilenameLocations.TryGetValue($"{name.Name}.{name.Version}.dll", out var path)) + { + if (File.Exists(path)) + return AssemblyDefinition.ReadAssembly(path, parameters); + } + else if (LibLoader.FilenameLocations.TryGetValue($"{name.Name}.dll", out path)) { if (File.Exists(path)) - { return AssemblyDefinition.ReadAssembly(path, parameters); - } } return base.Resolve(name, parameters);