From d228b637356cb9fe0cdd8937b6b3edaa4d19cf25 Mon Sep 17 00:00:00 2001
From: Bob Long <robertlong13@gmail.com>
Date: Tue, 24 Dec 2024 11:42:28 +1100
Subject: [PATCH] FlightData: update CMB_mountmode population

---
 GCSViews/FlightData.cs | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/GCSViews/FlightData.cs b/GCSViews/FlightData.cs
index dc1dde5b42..47ef4a877c 100644
--- a/GCSViews/FlightData.cs
+++ b/GCSViews/FlightData.cs
@@ -2662,18 +2662,19 @@ private void FlightData_Load(object sender, EventArgs e)
             Zoomlevel.Maximum = 24;
             Zoomlevel.Value = Convert.ToDecimal(gMapControl1.Zoom);
 
-            var item1 = ParameterMetaDataRepository.GetParameterOptionsInt("MNT_MODE",
-                MainV2.comPort.MAV.cs.firmware.ToString());
-            var item2 = ParameterMetaDataRepository.GetParameterOptionsInt("MNT_DEFLT_MODE",
-                MainV2.comPort.MAV.cs.firmware.ToString());
-            if (item1.Count > 0)
-                CMB_mountmode.DataSource = item1;
-
-            if (item2.Count > 0)
-                CMB_mountmode.DataSource = item2;
-
-            CMB_mountmode.DisplayMember = "Value";
-            CMB_mountmode.ValueMember = "Key";
+
+            var mnt_mode_paramnames = new List<string> { "MNT1_DEFLT_MODE", "MNT_DEFLT_MODE", "MNT_MODE" };
+            foreach (var name in mnt_mode_paramnames)
+            {
+                var item = ParameterMetaDataRepository.GetParameterOptionsInt(name, MainV2.comPort.MAV.cs.firmware.ToString());
+                if (item.Count > 0)
+                {
+                    CMB_mountmode.DataSource = item;
+                    CMB_mountmode.DisplayMember = "Value";
+                    CMB_mountmode.ValueMember = "Key";
+                    break;
+                }
+            }
 
             if (Settings.Instance["CHK_autopan"] != null)
                 CHK_autopan.Checked = Settings.Instance.GetBoolean("CHK_autopan");