fix: prevent null exception when access label fields in the rule (#63)

favoyang · Jan 6, 2022 · cebf133 · cebf133
1 parent f83865a
commit cebf133
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/Editor/AddressableImporter.cs b/Editor/AddressableImporter.cs
@@ -180,18 +180,24 @@ static AddressableAssetEntry CreateOrUpdateAddressableAssetEntry(
             // Add labels
             if (rule.LabelMode == LabelWriteMode.Replace)
                 entry.labels.Clear();
-            foreach (var label in rule.labelsRefsEnum)
+
+            if (rule.labelsRefsEnum != null)
             {
-                entry.labels.Add(label);
+                foreach (var label in rule.labelsRefsEnum)
+                {
+                    entry.labels.Add(label);
+                }
             }
 
-            foreach (var dynamicLabel in rule.dynamicLabels)
+            if (rule.dynamicLabels != null)
             {
-                var label = rule.ParseReplacement(assetPath, dynamicLabel);
-                settings.AddLabel(label);
-                entry.labels.Add(label);
+                foreach (var dynamicLabel in rule.dynamicLabels)
+                {
+                    var label = rule.ParseReplacement(assetPath, dynamicLabel);
+                    settings.AddLabel(label);
+                    entry.labels.Add(label);
+                }
             }
-
         }
         return entry;
     }