hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1590 from SiboVG/issue-1555

Browse Source 
[#1555] Don't open config dialog for duplicate config
This commit is contained in:
SiboVG 2022-08-23 22:16:31 +02:00 committed by GitHub
commit 1c38aa4dd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
swing/src/net/sf/openrocket/gui/main/FlightConfigurationPanel.java
View File

@ -159,16 +159,18 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
addOrDuplicateConfiguration(duplicate); addOrDuplicateConfiguration(duplicate);
configurationChanged(ComponentChangeEvent.MOTOR_CHANGE); configurationChanged(ComponentChangeEvent.MOTOR_CHANGE);
stateChanged(null); stateChanged(null);
switch (tabs.getSelectedIndex()) { if (!duplicate) {
case MOTOR_TAB_INDEX: switch (tabs.getSelectedIndex()) {
motorConfigurationPanel.selectMotor(); case MOTOR_TAB_INDEX:
break; motorConfigurationPanel.selectMotor();
case RECOVERY_TAB_INDEX: break;
recoveryConfigurationPanel.selectDeployment(); case RECOVERY_TAB_INDEX:
break; recoveryConfigurationPanel.selectDeployment();
case SEPARATION_TAB_INDEX: break;
separationConfigurationPanel.selectSeparation(); case SEPARATION_TAB_INDEX:
break; separationConfigurationPanel.selectSeparation();
break;
}
} }
configurationChanged(ComponentChangeEvent.NONFUNCTIONAL_CHANGE); // Trigger select configurationChanged(ComponentChangeEvent.NONFUNCTIONAL_CHANGE); // Trigger select
} }