Merge pull request #126 from Solaris-Skunk-Werks/bugfix/clear-turret-…

…selection Correctly set turret selector when loading CVs
Solaris-Skunk-Werks · Mar 23, 2020 · 415dd57 · 415dd57
2 parents 8273787 + 58e0160
commit 415dd57
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/saw/src/main/java/saw/gui/frmVee.java b/saw/src/main/java/saw/gui/frmVee.java
@@ -5637,7 +5637,6 @@ private void LoadSelections() {
     private void BuildTurretSelector()
     {
         ArrayList list = new ArrayList();
-        String curTurret = cmbTurret.getSelectedItem().toString();
 
         if ( !CurVee.IsOmni())
             cmbTurret.setEnabled(true);
@@ -5659,8 +5658,12 @@ private void BuildTurretSelector()
 
         // now set the turret chooser
         cmbTurret.setModel( new javax.swing.DefaultComboBoxModel( temp ) );
-
-        cmbTurret.setSelectedItem(curTurret);
+        if (CurVee.isHasTurret2())
+            cmbTurret.setSelectedItem("Dual Turret");
+        else if (CurVee.isHasTurret1())
+            cmbTurret.setSelectedItem("Single Turret");
+        else
+            cmbTurret.setSelectedItem("No Turret");
     }
 
     private void BuildChassisSelector()

diff --git a/saw/src/main/java/saw/gui/frmVeeWide.java b/saw/src/main/java/saw/gui/frmVeeWide.java
@@ -5501,7 +5501,6 @@ private void LoadSelections() {
     private void BuildTurretSelector()
     {
         ArrayList list = new ArrayList();
-        String curTurret = cmbTurret.getSelectedItem().toString();
 
         if ( !CurVee.IsOmni())
             cmbTurret.setEnabled(true);
@@ -5523,8 +5522,12 @@ private void BuildTurretSelector()
 
         // now set the turret chooser
         cmbTurret.setModel( new javax.swing.DefaultComboBoxModel( temp ) );
-
-        cmbTurret.setSelectedItem(curTurret);
+        if (CurVee.isHasTurret2())
+            cmbTurret.setSelectedItem("Dual Turret");
+        else if (CurVee.isHasTurret1())
+            cmbTurret.setSelectedItem("Single Turret");
+        else
+            cmbTurret.setSelectedItem("No Turret");
     }
 
     private void BuildChassisSelector()