From a05cf04abd13bf96a7248d4144e0d639275c823b Mon Sep 17 00:00:00 2001 From: SiboVG Date: Mon, 15 Aug 2022 01:32:48 +0200 Subject: [PATCH] [#1555] Don't open config dialog for duplicate config --- .../FlightConfigurationPanel.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java index 2e37fb14d..e7d50d546 100644 --- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java +++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java @@ -141,16 +141,18 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe addOrDuplicateConfiguration(duplicate); configurationChanged(ComponentChangeEvent.MOTOR_CHANGE); stateChanged(null); - switch (tabs.getSelectedIndex()) { - case MOTOR_TAB_INDEX: - motorConfigurationPanel.selectMotor(); - break; - case RECOVERY_TAB_INDEX: - recoveryConfigurationPanel.selectDeployment(); - break; - case SEPARATION_TAB_INDEX: - separationConfigurationPanel.selectSeparation(); - break; + if (!duplicate) { + switch (tabs.getSelectedIndex()) { + case MOTOR_TAB_INDEX: + motorConfigurationPanel.selectMotor(); + break; + case RECOVERY_TAB_INDEX: + recoveryConfigurationPanel.selectDeployment(); + break; + case SEPARATION_TAB_INDEX: + separationConfigurationPanel.selectSeparation(); + break; + } } configurationChanged(ComponentChangeEvent.NONFUNCTIONAL_CHANGE); // Trigger select }