Merge pull request #60 from zzxiang/empty-array

Allowed empty cells for non-enum array types in Google Spreadsheets.
kimsama · May 7, 2018 · 1e9f379 · 1e9f379
2 parents 4f092d5 + 8b6de5c
commit 1e9f379
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/Assets/QuickSheet/GDataPlugin/Editor/GDataDB/GDataDB/Impl/Serializer.cs b/Assets/QuickSheet/GDataPlugin/Editor/GDataDB/GDataDB/Impl/Serializer.cs
@@ -95,17 +95,19 @@ public T Deserialize(ListEntry e) {
                                 char[] charToTrim = { ',', ' ' };
                                 str = str.TrimEnd(charToTrim);
 
-                                // split by ','
-                                object[] temp = str.Split(DELIMETER);
+                                if (!string.IsNullOrEmpty(str)) {
+                                    // split by ','
+                                    object[] temp = str.Split(DELIMETER);
 
-                                Array array = (Array)Activator.CreateInstance(property.PropertyType, temp.Length);
+                                    Array array = (Array)Activator.CreateInstance(property.PropertyType, temp.Length);
 
-                                for (int i = 0; i < array.Length; i++) 
-                                {
-                                    array.SetValue(Convert.ChangeType(temp[i], property.PropertyType.GetElementType()), i);
-                                }
+                                    for (int i = 0; i < array.Length; i++)
+                                    {
+                                        array.SetValue(Convert.ChangeType(temp[i], property.PropertyType.GetElementType()), i);
+                                    }
 
-                                property.SetValue(r, array, null);
+                                    property.SetValue(r, array, null);
+                                }
                             }
                         } 
                         else