Skip to content

Commit c81ea74

Browse files
Merge pull request #2349 from MuMech/lcg/fix-reflection-throwing
Remove use of assembly.GetName().Name
2 parents 61e616a + 38a95ad commit c81ea74

1 file changed

Lines changed: 4 additions & 13 deletions

File tree

‎MechJebLibBindings/ReflectionUtils.cs‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ static ReflectionUtils()
2222
{
2323
IsLoadedProceduralFairing = IsAssemblyLoaded("ProceduralFairings");
2424
IsLoadedRealFuels = IsAssemblyLoaded("RealFuels");
25-
IsLoadedPrincipia = IsAssemblyLoaded("principia.ksp_plugin_adapter");
25+
IsLoadedPrincipia = IsAssemblyLoaded("ksp_plugin_adapter");
2626
IsLoadedFAR = IsAssemblyLoaded("FerramAerospaceResearch");
2727
IsLoadedRealismOverhaul = IsAssemblyLoaded("RealismOverhaul");
2828
IsLoadedRP0 = IsAssemblyLoaded("RP0");
@@ -31,17 +31,8 @@ static ReflectionUtils()
3131
public static bool IsAssemblyLoaded(string assemblyName)
3232
{
3333
foreach (AssemblyLoader.LoadedAssembly loaded in AssemblyLoader.loadedAssemblies)
34-
{
35-
try
36-
{
37-
if (loaded.assembly.GetName().Name == assemblyName)
38-
return true;
39-
}
40-
catch (Exception)
41-
{
42-
// ignore busted assemblies
43-
}
44-
}
34+
if (string.Equals(loaded.name, assemblyName, StringComparison.OrdinalIgnoreCase))
35+
return true;
4536

4637
return false;
4738
}
@@ -54,7 +45,7 @@ public static AssemblyContext Assembly(string assemblyString)
5445
{
5546
try
5647
{
57-
if (loaded.assembly.GetName().Name == assemblyString)
48+
if (string.Equals(loaded.name, assemblyString, StringComparison.OrdinalIgnoreCase))
5849
assemblyName = loaded.assembly.FullName;
5950
}
6051
catch (Exception)

0 commit comments

Comments
 (0)