- fixes null ref exception for tsd data when not connected

FalcoGer · May 21, 2024 · 13ae8a6 · 13ae8a6
1 parent 543f712
commit 13ae8a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CoordinateConverter/DCS/Aircraft/AH64/AH64TSDOptionData.cs b/CoordinateConverter/DCS/Aircraft/AH64/AH64TSDOptionData.cs
@@ -1219,6 +1219,10 @@ static public AH64TSDOptionData ReadFromAC(bool isPilot)
         public List<DCSCommand> GenerateCommands(bool isPilot)
         {
             AH64TSDOptionData startingCondition = ReadFromAC(isPilot);
+            if (startingCondition == null)
+            {
+                return new List<DCSCommand>();
+            }
             EPhase currentPhase = startingCondition.Phase;
             int mfd = isPilot ? (int)AH64.EDeviceCode.PLT_RMFD : (int)AH64.EDeviceCode.CPG_RMFD;
 

diff --git a/CoordinateConverter/DCS/Tools/FormAH64DTC.cs b/CoordinateConverter/DCS/Tools/FormAH64DTC.cs
@@ -1873,7 +1873,11 @@ private void nudManRange_ValueChanged(object sender, EventArgs e)
         #region TSD
         private void btn_getMapSettings_Click(object sender, EventArgs e)
         {
-            data.TSDData = AH64TSDOptionData.ReadFromAC(IsPilot);
+            var newTsdData = AH64TSDOptionData.ReadFromAC(IsPilot);
+            if (newTsdData != null)
+            {
+                data.TSDData = newTsdData;
+            }
             RefreshControls();
         }