Fixed issue #48. Added clear separator method to ship list combobox.

Author: Mark Austen

TradeDangerousGUI/Changelog.txt

@@ -1,3 +1,8 @@
+v2.1.0.3
+--------
+* Fixed bug in commander profile. Issue #48.
+* Added clear separator method in ship drop down list.
+
 v2.1.0.2
 --------
 * Removed any empty options in the update DB command. Fixes issue #47.

TradeDangerousGUI/Delegates.cs

@@ -1213,7 +1213,7 @@ private void UpdateCommanderAndShipDetails()
 
                 string availableShips = string.Empty;
 
-                JToken token = cmdrProfile["ships"];
+                JToken token = cmdrProfile["profile"]["ships"];
                 string listStructure = string.Empty;
 
                 if (token is JArray)

TradeDangerousGUI/MainClass.cs

@@ -435,6 +435,7 @@ public void SetShipList(bool refreshList = false)
                 validConfigs = SetAvailableShips();
 
                 cboCommandersShips.Items.Clear();
+                cboCommandersShips.ClearSeparators();
 
                 foreach (ComboBoxItem item in validConfigs)
                 {
@@ -448,7 +449,7 @@ public void SetShipList(bool refreshList = false)
 
                 if (index < cboCommandersShips.Items.Count)
                 {
-                    cboCommandersShips.SetSeparator(index);
+                    cboCommandersShips.SetSeparator(cboCommandersShips.Items.Count - index);
                 }
             }
 

TradeDangerousGUI/Properties/AssemblyInfo.cs

@@ -31,4 +31,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.2")]
+[assembly: AssemblyVersion("2.1.0.3")]

TradeDangerousGUI/SeparatorCombobox.cs

@@ -61,6 +61,11 @@ public void SetSeparator(int pos)
             _separators.Add(pos);
         }
 
+        public void ClearSeparators()
+        {
+            _separators.Clear();
+        }
+
         protected override void OnDrawItem(DrawItemEventArgs e)
         {
             if (-1 == e.Index) return;

TradeDangerousGUI/mainForm.cs

@@ -1252,23 +1252,30 @@ private void EventHandler_cApiTimer_Delegate(
             object sender,
             ElapsedEventArgs e)
         {
-            Invoke(new Action(() =>
+            try
             {
-                settingsRef.TimeOut -= 1;
-
-                if (settingsRef.TimeOut > 0)
-                {
-                    btnCmdrProfile.Text = "({0})".With(settingsRef.TimeOut);
-                    btnCmdrProfile.Enabled = false;
-                }
-                else
+                Invoke(new Action(() =>
                 {
-                    cApiTimer.Stop();
+                    settingsRef.TimeOut -= 1;
 
-                    btnCmdrProfile.Text = "Cmdr Profile";
-                    btnCmdrProfile.Enabled = true;
-                }
-            }));
+                    if (settingsRef.TimeOut > 0)
+                    {
+                        btnCmdrProfile.Text = "({0})".With(settingsRef.TimeOut);
+                        btnCmdrProfile.Enabled = false;
+                    }
+                    else
+                    {
+                        cApiTimer.Stop();
+
+                        btnCmdrProfile.Text = "Cmdr Profile";
+                        btnCmdrProfile.Enabled = true;
+                    }
+                }));
+            }
+            catch (Exception ex)
+            {
+                // Do nothing.
+            }
         }
 
         /// <summary>