APFirmware: add nullchecks

magicrub · Jun 19, 2021 · 5430f8e · 5430f8e
1 parent ab7644c
commit 5430f8e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/ExtLibs/ArduPilot/APFirmware.cs b/ExtLibs/ArduPilot/APFirmware.cs
@@ -116,10 +116,12 @@ public static void GetList(string url = "https://firmware.ardupilot.org/manifest
         {
             GetList();
 
+            log.Info("device: "+device.ToJSON());
+
             // match the board description
             var ans = Manifest.Firmware.Where(a => (
-                a.Platform.ToLower() == device.board.ToLower() ||
-                a.BootloaderStr.Any(b => b.ToLower() == device.board.ToLower())) && a.BoardId != 0);
+                a.Platform?.ToLower() == device.board?.ToLower() ||
+                a.BootloaderStr.Any(b => b?.ToLower() == device.board?.ToLower())) && a.BoardId != 0);
 
             if (ans.Any())
             {
@@ -152,10 +154,12 @@ public static List<FirmwareInfo> GetOptions(DeviceInfo device, RELEASE_TYPES? re
         {
             GetList();
 
+            log.Info("device: "+device.ToJSON());
+
             // match the board description
             var ans = Manifest.Firmware.Where(a => (
-                a.Platform.ToLower() == device.board.ToLower() ||
-                a.BootloaderStr.Any(b => b.ToLower() == device.board.ToLower())) && a.BoardId != 0);
+                a.Platform?.ToLower() == device.board?.ToLower() ||
+                a.BootloaderStr.Any(b => b?.ToLower() == device.board?.ToLower())) && a.BoardId != 0);
 
             // ignore platform
             ans = Manifest.Firmware;