From ceefac6ddc712fc4eeab6685c7daf750f833e5d6 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sat, 20 Apr 2019 16:37:05 +0200 Subject: [PATCH] Fix #1490: NRE in MemberLookup.AddMembers --- ICSharpCode.Decompiler/CSharp/Resolver/MemberLookup.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ICSharpCode.Decompiler/CSharp/Resolver/MemberLookup.cs b/ICSharpCode.Decompiler/CSharp/Resolver/MemberLookup.cs index 157fbcb0f..2dca76dca 100644 --- a/ICSharpCode.Decompiler/CSharp/Resolver/MemberLookup.cs +++ b/ICSharpCode.Decompiler/CSharp/Resolver/MemberLookup.cs @@ -532,7 +532,7 @@ namespace ICSharpCode.Decompiler.CSharp.Resolver var lookupGroup = lookupGroups[i]; if (typeBaseTypes.Contains(lookupGroup.DeclaringType)) { - if (method != null) { + if (method != null && !lookupGroup.MethodsAreHidden) { // Find the matching method, and replace it with the override for (int j = 0; j < lookupGroup.Methods.Count; j++) { if (SignatureComparer.Ordinal.Equals(method, lookupGroup.Methods[j])) {