From f4dce54312aa0be8bf8b0a6a1a27ed4f74e9bf0d Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Sat, 16 Mar 2013 20:49:02 -0500 Subject: [PATCH] Correct handling of ejectionCharges in getter and clone. --- .../net/sf/openrocket/motor/MotorInstanceConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/net/sf/openrocket/motor/MotorInstanceConfiguration.java b/core/src/net/sf/openrocket/motor/MotorInstanceConfiguration.java index 45162e5c3..28841699f 100644 --- a/core/src/net/sf/openrocket/motor/MotorInstanceConfiguration.java +++ b/core/src/net/sf/openrocket/motor/MotorInstanceConfiguration.java @@ -74,7 +74,7 @@ public final class MotorInstanceConfiguration implements Monitorable, Cloneable } public double getEjectionDelay(MotorId id) { - return ignitionDelays.get(indexOf(id)); + return ejectionDelays.get(indexOf(id)); } public MotorMount getMotorMount(MotorId id) { @@ -154,6 +154,7 @@ public final class MotorInstanceConfiguration implements Monitorable, Cloneable clone.ids.addAll(this.ids); clone.mounts.addAll(this.mounts); clone.positions.addAll(this.positions); + clone.ejectionDelays.addAll(this.ejectionDelays); clone.ignitionTimes.addAll(this.ignitionTimes); clone.ignitionEvents.addAll(this.ignitionEvents); clone.ignitionDelays.addAll(this.ignitionDelays);