From a526b18626e008d5f5e470d7486311646729d192 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 25 May 2022 16:54:32 +0200 Subject: [PATCH] [#1375] Fix preset not "resetting" nose cone / transition shape parameter --- core/src/net/sf/openrocket/rocketcomponent/Transition.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/rocketcomponent/Transition.java b/core/src/net/sf/openrocket/rocketcomponent/Transition.java index 18cffea6d..b7320d4cb 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Transition.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Transition.java @@ -257,7 +257,7 @@ public class Transition extends SymmetricComponent implements InsideColorCompone if (type == null) { throw new IllegalArgumentException("setType called with null argument"); } - if (this.type == type) + if ((this.type == type) && (this.clipped == type.isClippable()) && (this.shapeParameter == type.defaultParameter())) return; this.type = type; this.clipped = type.isClippable(); @@ -284,7 +284,7 @@ public class Transition extends SymmetricComponent implements InsideColorCompone return; this.shapeParameter = MathUtil.clamp(n, type.minParameter(), type.maxParameter()); - // Need to clearPreset when shape type changes. + // Need to clearPreset when shape parameter changes. clearPreset(); fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);