From 404c2c8626ff339cf031ef1ff8aba72a7ab5b46a Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sun, 5 Jun 2022 13:55:31 +0200 Subject: [PATCH 1/2] Fix sim updating when plotting --- .../net/sf/openrocket/gui/simulation/SimulationEditDialog.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/swing/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java index b308c5df9..6a5c40fd5 100644 --- a/swing/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java +++ b/swing/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java @@ -290,7 +290,8 @@ public class SimulationEditDialog extends JDialog { @Override public void actionPerformed(ActionEvent e) { // If the simulation is out of date, run the simulation. - if (simulationList[0].getStatus() != Simulation.Status.UPTODATE) { + if (simulationList[0].getStatus() != Simulation.Status.UPTODATE && + simulationList[0].getStatus() != Simulation.Status.LOADED) { new SimulationRunDialog(SimulationEditDialog.this.parentWindow, document, simulationList[0]).setVisible(true); } From 6478046bcb1dfafe5ebaccd90386ec0e8b77d477 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Tue, 7 Jun 2022 02:04:32 +0200 Subject: [PATCH 2/2] [#1409] Remove instancecount multiplication in getSectionMass --- core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java index c3267d93a..af2e046c9 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java +++ b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java @@ -1377,7 +1377,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab massSubtotal += rc.getSectionMass(); } - return massSubtotal * getInstanceCount(); + return massSubtotal; } /**