Prefer friendly names from oid.txt over the friendly names of the sys…

…tem.
RufusJWB · Jan 29, 2019 · 69537bb · 69537bb
1 parent 10cd1d5
commit 69537bb
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/Asn1Editor/API/Utils/ASN/AsnDecoder.cs b/Asn1Editor/API/Utils/ASN/AsnDecoder.cs
@@ -209,12 +209,18 @@ class AsnDecoder {
  }
  static String DecodeObjectIdentifier(Asn1Reader asn) {
  Oid oid = new Asn1ObjectIdentifier(asn).Value;
- if (String.IsNullOrEmpty(oid.FriendlyName) && MainWindowVM.OIDs.ContainsKey(oid.Value)) {
- oid.FriendlyName = MainWindowVM.OIDs[oid.Value];
+
+ if (MainWindowVM.OIDs.ContainsKey(oid.Value))
+ {
+ return MainWindowVM.OIDs[oid.Value]; //todo: This seems not to be thread safe
+ }
+
+ if (!String.IsNullOrWhiteSpace(oid.FriendlyName))
+ {
+ return $"{oid.FriendlyName} ({oid.Value})";
  }
- return String.IsNullOrEmpty(oid.FriendlyName)
- ? oid.Value
- : $"{oid.FriendlyName} ({oid.Value})";
+
+ return oid.Value;
  }
  static String DecodeUTF8String(Asn1Reader asn) {
  return Encoding.UTF8.GetString(asn.RawData, asn.PayloadStartOffset, asn.PayloadLength);