Check if expression menu is null

SaracenOne · Aug 4, 2022 · 09b3fea · 09b3fea
1 parent 91414f3
commit 09b3fea
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/Editor/VRC3CVR.cs b/Editor/VRC3CVR.cs
@@ -388,24 +388,26 @@ void MatchAnimatorParameterToVRCParameter(VRCExpressionParameter vrcParam) {
         chilloutAnimatorController.parameters = parameters;
     }
     Dictionary<string, Dictionary<int, string>> FindMenuButtonsAndToggles(VRCExpressionsMenu menu, Dictionary<string, Dictionary<int, string>> toggleTable) {
-        foreach (VRCExpressionsMenu.Control control in menu.controls) {
-            if (control.type == VRCExpressionsMenu.Control.ControlType.Toggle || control.type == VRCExpressionsMenu.Control.ControlType.Button) {
-                Dictionary<int, string> idTable;
-                if(toggleTable.ContainsKey(control.parameter.name)) {
-                    idTable = toggleTable[control.parameter.name];
-                } else {
-                    idTable = new Dictionary<int, string>();
-                }
-
-                if (!idTable.ContainsKey((int)control.value)) {
-                    idTable.Add((int)control.value, control.name);
-                }
-
-                toggleTable[control.parameter.name] = idTable;
-            } else if (control.type == VRCExpressionsMenu.Control.ControlType.SubMenu) {
-                toggleTable = FindMenuButtonsAndToggles(control.subMenu, toggleTable);
-            }
-        }
+		if (menu != null) {
+	        foreach (VRCExpressionsMenu.Control control in menu.controls) {
+	            if (control.type == VRCExpressionsMenu.Control.ControlType.Toggle || control.type == VRCExpressionsMenu.Control.ControlType.Button) {
+	                Dictionary<int, string> idTable;
+	                if(toggleTable.ContainsKey(control.parameter.name)) {
+	                    idTable = toggleTable[control.parameter.name];
+	                } else {
+	                    idTable = new Dictionary<int, string>();
+	                }
+
+	                if (!idTable.ContainsKey((int)control.value)) {
+	                    idTable.Add((int)control.value, control.name);
+	                }
+
+	                toggleTable[control.parameter.name] = idTable;
+	            } else if (control.type == VRCExpressionsMenu.Control.ControlType.SubMenu) {
+	                toggleTable = FindMenuButtonsAndToggles(control.subMenu, toggleTable);
+	            }
+	        }
+		}
 
         return toggleTable;
     }