From 81ce49c219fd6d632a0e4d09c5df4ea3f25796a7 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Sun, 29 Aug 2021 11:15:37 -0700
Subject: [PATCH] Fix manifest description finding

---
 BurnOutSharp/Tools/Utilities.cs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/BurnOutSharp/Tools/Utilities.cs b/BurnOutSharp/Tools/Utilities.cs
index 54b0a368..548e5f91 100644
--- a/BurnOutSharp/Tools/Utilities.cs
+++ b/BurnOutSharp/Tools/Utilities.cs
@@ -315,8 +315,13 @@ namespace BurnOutSharp.Tools
             // Try to read the XML in from the string
             try
             {
+                // Try to read the assembly
+                var assemblyNode = GetAssemblyNode(manifestString);
+                if (assemblyNode == null)
+                    return null;
+
                 // Try to read the assemblyIdentity
-                var assemblyIdentityNode = GetAssemblyIdentityNode(manifestString);
+                var assemblyIdentityNode = assemblyNode["assemblyIdentity"];
                 if (assemblyIdentityNode == null)
                     return null;
                 
@@ -344,13 +349,13 @@ namespace BurnOutSharp.Tools
             // Try to read the XML in from the string
             try
             {
-                // Try to read the assemblyIdentity
-                var assemblyIdentityNode = GetAssemblyIdentityNode(manifestString);
-                if (assemblyIdentityNode == null)
+                // Try to read the assembly
+                var assemblyNode = GetAssemblyNode(manifestString);
+                if (assemblyNode == null)
                     return null;
 
                 // Return the content of the description node, if possible
-                var descriptionNode = assemblyIdentityNode["description"];
+                var descriptionNode = assemblyNode["description"];
                 if (descriptionNode == null)
                     return null;
                     
@@ -393,7 +398,7 @@ namespace BurnOutSharp.Tools
         /// </summary>
         /// <param name="manifestString">String representing the XML document</param>
         /// <returns>Assembly identity node, if possible</returns>
-        private static XmlElement GetAssemblyIdentityNode(string manifestString)
+        private static XmlElement GetAssemblyNode(string manifestString)
         {
             // An invalid string means we can't read it
             if (string.IsNullOrWhiteSpace(manifestString))
@@ -410,12 +415,7 @@ namespace BurnOutSharp.Tools
                     return null;
 
                 // Try to read the assembly node
-                var assemblyNode = manifestDoc["assembly"];
-                if (assemblyNode == null)
-                    return null;
-
-                // Try to read the assemblyIdentity
-                return assemblyNode["assemblyIdentity"];
+                return manifestDoc["assembly"];
             }
             catch
             {