tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Checks

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2022-08-18 10:45:07 -06:00
parent 8af4c71101
commit 09cc838bb4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/LibationFileManager/InteropFactory.cs
View File

@ -39,8 +39,6 @@ namespace LibationFileManager
// searches file names for potential matches; doesn't run anything // searches file names for potential matches; doesn't run anything
var configApp = getOSConfigApp(); var configApp = getOSConfigApp();
#if DEBUG
// nothing to load // nothing to load
if (configApp is null) if (configApp is null)
{ {
@ -48,6 +46,9 @@ namespace LibationFileManager
return; return;
} }
#if DEBUG
// runs the exe and gets the exe's loaded modules // runs the exe and gets the exe's loaded modules
ModuleList = LoadModuleList(Path.GetFileNameWithoutExtension(configApp)) ModuleList = LoadModuleList(Path.GetFileNameWithoutExtension(configApp))
.OrderBy(x => x.ModuleName) .OrderBy(x => x.ModuleName)
@ -56,7 +57,7 @@ namespace LibationFileManager
AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve; AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
var configAppAssembly = Assembly.LoadFrom(Path.ChangeExtension(configApp, "dll")); var configAppAssembly = Assembly.LoadFrom(configApp);
var type = typeof(IInteropFunctions); var type = typeof(IInteropFunctions);
InteropFunctionsType = configAppAssembly InteropFunctionsType = configAppAssembly
.GetTypes() .GetTypes()
@ -121,7 +122,7 @@ namespace LibationFileManager
#if DEBUG #if DEBUG
// `First` instead of `FirstOrDefault`. If it's not present we're going to fail anyway. May as well be here // `First` instead of `FirstOrDefault`. If it's not present we're going to fail anyway. May as well be here
var modulePath = ModuleList.SingleOrDefault(m => m.ModuleName.EqualsInsensitive(asmName)).FileName; var modulePath = ModuleList.SingleOrDefault(m => m.ModuleName.EqualsInsensitive(asmName))?.FileName;
#else #else
var here = Path.GetDirectoryName(Environment.ProcessPath); var here = Path.GetDirectoryName(Environment.ProcessPath);