From 665a2d67e51a976b3020870434a1d8c6f0f6cc29 Mon Sep 17 00:00:00 2001
From: dexy <dexyfex@outlook.com>
Date: Sun, 8 Mar 2020 18:18:40 +1100
Subject: [PATCH] Fix for UnkUshort ordering in XML/AWC conversion

---
 CodeWalker.Core/GameFiles/FileTypes/AwcFile.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/CodeWalker.Core/GameFiles/FileTypes/AwcFile.cs b/CodeWalker.Core/GameFiles/FileTypes/AwcFile.cs
index 7f0cc16..f49f05a 100644
--- a/CodeWalker.Core/GameFiles/FileTypes/AwcFile.cs
+++ b/CodeWalker.Core/GameFiles/FileTypes/AwcFile.cs
@@ -310,7 +310,6 @@ namespace CodeWalker.GameFiles
             Version = (ushort)Xml.GetChildUIntAttribute(node, "Version");
             MultiChannelFlag = Xml.GetChildBoolAttribute(node, "MultiChannel");
 
-            var unkUshorts = new List<ushort>();
             var hasUshorts = false;
 
             var snode = node.SelectSingleNode("Streams");
@@ -325,7 +324,6 @@ namespace CodeWalker.GameFiles
                     slist.Add(stream);
 
                     hasUshorts = hasUshorts || stream.UnkUshort.HasValue;
-                    unkUshorts.Add(stream.UnkUshort ?? 0);
 
                     if (MultiChannelFlag && (stream.StreamFormatChunk != null) && (stream.Hash == 0))
                     {
@@ -342,6 +340,14 @@ namespace CodeWalker.GameFiles
 
             if (hasUshorts)
             {
+                var unkUshorts = new List<ushort>();
+                if (Streams != null)
+                {
+                    foreach (var stream in Streams)
+                    {
+                        unkUshorts.Add(stream.UnkUshort ?? 0);
+                    }
+                }
                 UnkUshorts = unkUshorts.ToArray();
                 UnkUshortsFlag = true;
             }