fix unhandled crash while checking for FW update at boot without inte…

…rnet available
ArduPilot · Apr 25, 2023 · 9d3b663 · 9d3b663
1 parent 4e845cd
commit 9d3b663
Showing 1 changed file with 20 additions and 13 deletions.
diff --git a/ExtLibs/ArduPilot/APFirmware.cs b/ExtLibs/ArduPilot/APFirmware.cs
@@ -104,24 +104,31 @@ public static void GetList(string url = "https://firmware.ardupilot.org/manifest
                 if (force == false && Manifest != null)
                     return;
 
-                log.Info(url);
+                try
+                {
+                    log.Info(url);
 
-                var client = new HttpClient();
+                    var client = new HttpClient();
 
-                if (!String.IsNullOrEmpty(Settings.Instance.UserAgent))
-                    client.DefaultRequestHeaders.Add("User-Agent", Settings.Instance.UserAgent);
+                    if (!String.IsNullOrEmpty(Settings.Instance.UserAgent))
+                        client.DefaultRequestHeaders.Add("User-Agent", Settings.Instance.UserAgent);
 
-                var manifestgz = client.GetByteArrayAsync(url).GetAwaiter().GetResult();
-                var mssrc = new MemoryStream(manifestgz);
-                var msdest = new MemoryStream();
-                GZipStream gz = new GZipStream(mssrc, CompressionMode.Decompress);
-                gz.CopyTo(msdest);
-                msdest.Position = 0;
-                var manifest = new StreamReader(msdest).ReadToEnd();
+                    var manifestgz = client.GetByteArrayAsync(url).GetAwaiter().GetResult();
+                    var mssrc = new MemoryStream(manifestgz);
+                    var msdest = new MemoryStream();
+                    GZipStream gz = new GZipStream(mssrc, CompressionMode.Decompress);
+                    gz.CopyTo(msdest);
+                    msdest.Position = 0;
+                    var manifest = new StreamReader(msdest).ReadToEnd();
 
-                Manifest = JsonConvert.DeserializeObject<ManifestRoot>(manifest);
+                    Manifest = JsonConvert.DeserializeObject<ManifestRoot>(manifest);
 
-                log.Info(Manifest.Firmware?.Length);
+                    log.Info(Manifest.Firmware?.Length);
+                }
+                catch (Exception ex)
+                {
+                    log.Error(ex);
+                }
             }
         }