From 69f651d670b97da89f4597c1983b1b9ba6a67313 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Tue, 4 Jul 2023 23:43:26 +0200
Subject: [PATCH 1/2] [#2244] Copy default sep config instead of creating new
 one

---
 core/src/net/sf/openrocket/rocketcomponent/AxialStage.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/AxialStage.java b/core/src/net/sf/openrocket/rocketcomponent/AxialStage.java
index 504969e27..b4d3ac47e 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/AxialStage.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/AxialStage.java
@@ -207,10 +207,10 @@ public class AxialStage extends ComponentAssembly implements FlightConfigurableC
 	public StageSeparationConfiguration getSeparationConfiguration() {
 		FlightConfiguration flConfig = getRocket().getSelectedConfiguration();
 		StageSeparationConfiguration sepConfig = getSeparationConfigurations().get(flConfig.getId());
-		// to ensure the configuration is distinct, and we're not modifying the default
+		// To ensure the configuration is distinct, and we're not modifying the default
 		if ((sepConfig == getSeparationConfigurations().getDefault())
 				&& (flConfig.getId() != FlightConfigurationId.DEFAULT_VALUE_FCID)) {
-			sepConfig = new StageSeparationConfiguration();
+			sepConfig = sepConfig.copy(flConfig.getId());
 			getSeparationConfigurations().set(flConfig.getId(), sepConfig);
 		}
 		return sepConfig;

From ba0867ee8e8ea152497ef2c411b5d7693c920b65 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Tue, 4 Jul 2023 23:45:39 +0200
Subject: [PATCH 2/2] Use selected config as init ID This fixes a bug where
 multi-editing different flight configurations in the same stage (e.g. of the
 last booster stage of 'Three-stage rocket') would not always correctly work

---
 .../SeparationConfigurationPanel.java                  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java
index 306877c46..c978649ce 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java
@@ -181,10 +181,13 @@ public class SeparationConfigurationPanel extends FlightConfigurablePanel<AxialS
 		}
 
 		boolean update = false;
-		AxialStage initStage = stages.get(0);
-		FlightConfigurationId initFcId = fcIds.get(0);
+		AxialStage initStage = stages.get(0);			// Arbitrary choice of stage (all stages should have the same settings due to multi-comp editing)
+		FlightConfigurationId initFcId = rocket.getSelectedConfiguration().getId();		// The SeparationSelectionDialog should apply its separation settings to the selected configuration
 
+		// Store the initial configuration so we can check later whether something changed
 		StageSeparationConfiguration initialConfig = initStage.getSeparationConfigurations().get(initFcId).copy(initFcId);
+
+		// Launch the separation config dialog
 		JDialog d = new SeparationSelectionDialog(SwingUtilities.getWindowAncestor(this), rocket, initStage);
 		d.setVisible(true);
 
@@ -195,6 +198,7 @@ public class SeparationConfigurationPanel extends FlightConfigurablePanel<AxialS
 		double separationDelay = initStage.getSeparationConfigurations().get(initFcId).getSeparationDelay();
 		SeparationEvent separationEvent= initStage.getSeparationConfigurations().get(initFcId).getSeparationEvent();
 
+		// Parse all stages anc flight configurations to check whether we need to update
 		for (int i = 0; i < stages.size(); i++) {
 			for (int j = 0; j < fcIds.size(); j++) {
 				if ((i == 0) && (j == 0)) break;
@@ -205,7 +209,7 @@ public class SeparationConfigurationPanel extends FlightConfigurablePanel<AxialS
 				initialConfig = config.copy(fcId);
 
 				if (stage.getSeparationConfigurations().isDefault(config)) {
-					config = config.clone();
+					config = config.copy(fcId);
 				}
 
 				config.setSeparationDelay(separationDelay);