From 10b932ae0bbf1900cfff393835b3a917dbd5e438 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Wed, 20 Dec 2017 21:51:35 +0100
Subject: [PATCH] Fix assembly loading glitch when decompiling assembly nodes
 (assembly attributes + header)

---
 ILSpy/LoadedAssembly.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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