fix: improve null checks in CloneControl

Fixes: #499
bdunderscore · Dec 28, 2023 · 70a6d79 · 70a6d79
1 parent d87d057
commit 70a6d79
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/Editor/Menu/MenuExtractor.cs b/Editor/Menu/MenuExtractor.cs
@@ -1,5 +1,6 @@
 #if MA_VRCSDK3_AVATARS
 
+using System;
 using System.Linq;
 using UnityEditor;
 using UnityEngine;
@@ -119,12 +120,12 @@ internal static VRCExpressionsMenu.Control CloneControl(VRCExpressionsMenu.Contr
                 type = c.type,
                 name = c.name,
                 icon = c.icon,
-                parameter = new VRCExpressionsMenu.Control.Parameter() {name = c.parameter?.name},
+                parameter = new VRCExpressionsMenu.Control.Parameter() { name = c.parameter?.name },
                 subMenu = c.subMenu,
                 subParameters = c.subParameters?.Select(p =>
-                        new VRCExpressionsMenu.Control.Parameter() {name = p?.name})
-                    .ToArray(),
-                labels = c.labels.ToArray(),
+                        new VRCExpressionsMenu.Control.Parameter() { name = p?.name })
+                    ?.ToArray() ?? Array.Empty<VRCExpressionsMenu.Control.Parameter>(),
+                labels = c.labels?.ToArray() ?? Array.Empty<VRCExpressionsMenu.Control.Label>(),
                 style = c.style,
                 value = c.value,
             };