Browse Source

Fix assembly loading glitch when decompiling assembly nodes (assembly attributes + header)

pull/1039/head
Siegfried Pammer 8 years ago
parent
commit
10b932ae0b
  1. 6
      ILSpy/LoadedAssembly.cs

6
ILSpy/LoadedAssembly.cs

@ -272,9 +272,6 @@ namespace ICSharpCode.ILSpy
} }
} }
if (assemblyLoadDisableCount > 0)
return null;
if (data.isWinRT) { if (data.isWinRT) {
file = Path.Combine(Environment.SystemDirectory, "WinMetadata", data.fullName + ".winmd"); file = Path.Combine(Environment.SystemDirectory, "WinMetadata", data.fullName + ".winmd");
} else { } else {
@ -292,6 +289,9 @@ namespace ICSharpCode.ILSpy
if (file != null && loadingAssemblies.TryGetValue(file, out asm)) if (file != null && loadingAssemblies.TryGetValue(file, out asm))
return asm; return asm;
if (assemblyLoadDisableCount > 0)
return null;
if (file != null) { if (file != null) {
LoadedAssemblyReferencesInfo.AddMessage(data.fullName, MessageKind.Info, "Success - Loading from: " + file); LoadedAssemblyReferencesInfo.AddMessage(data.fullName, MessageKind.Info, "Success - Loading from: " + file);
asm = new LoadedAssembly(assemblyList, file) { IsAutoLoaded = true }; asm = new LoadedAssembly(assemblyList, file) { IsAutoLoaded = true };

Loading…
Cancel
Save