Fix error for showing storage data (#7)

imengyu · Dec 1, 2024 · 107e9c2 · 107e9c2
1 parent 5327564
commit 107e9c2
Showing 1 changed file with 22 additions and 15 deletions.
diff --git a/ONICPU/FCPU.cs b/ONICPU/FCPU.cs
@@ -938,25 +938,32 @@ public void OnShowProgramEditor()
             if (CPUType == FCPUType.JavaScript)
             {
               var sb = new StringBuilder();
-              var js = JsonConvert.DeserializeObject<Dictionary<string, object>>(cpuStorageData);
-              var len = 0;
-              foreach (var item in js)
+              var js = string.IsNullOrEmpty(cpuStorageData) ?
+                null :
+                JsonConvert.DeserializeObject<Dictionary<string, object>>(cpuStorageData);
+              if (js == null || js.Count == 0)
               {
-                sb.Append(item.Key);
-                sb.Append(" : ");
-                sb.AppendLine(item.Value.ToString());
-
-                if (len > 30)
+                sb.Append("Empty, No storaged data");
+              }
+              else
+              { 
+                var len = 0;
+                foreach (var item in js)
                 {
-                  sb.Append("... (");
-                  sb.Append(js.Count - len);
-                  sb.Append("+)");
+                  sb.Append(item.Key);
+                  sb.Append(" : ");
+                  sb.AppendLine(item.Value.ToString());
+
+                  if (len > 30)
+                  {
+                    sb.Append("... (");
+                    sb.Append(js.Count - len);
+                    sb.Append("+)");
+                  }
+
+                  len++;
                 }
-
-                len++;
               }
-              if (js.Count == 0)
-                sb.Append("Empty, No storaged data");
 
               UIUtils.ShowMessageModal(
                 "storage",