From 164513fd6ddcb4bbf08ec21042d6bd77f30a2e6b Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 21 Oct 2022 14:23:01 +0200 Subject: [PATCH] [#1761] Correctly fix #1375 this time... --- core/src/net/sf/openrocket/rocketcomponent/Transition.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/net/sf/openrocket/rocketcomponent/Transition.java b/core/src/net/sf/openrocket/rocketcomponent/Transition.java index 8c819e276..c63dff741 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Transition.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Transition.java @@ -257,7 +257,8 @@ public class Transition extends SymmetricComponent implements InsideColorCompone if (type == null) { throw new IllegalArgumentException("setType called with null argument"); } - if ((this.type == type) && (this.clipped == type.isClippable()) && (this.shapeParameter == type.defaultParameter())) + + if (this.type == type) return; this.type = type; this.clipped = type.isClippable(); @@ -687,6 +688,8 @@ public class Transition extends SymmetricComponent implements InsideColorCompone if ( preset.has(ComponentPreset.SHAPE) ) { Shape s = preset.get(ComponentPreset.SHAPE); this.setType(s); + this.setClipped(s.canClip); + this.setShapeParameter(s.defaultParameter()); } if ( preset.has(ComponentPreset.AFT_OUTER_DIAMETER) ) { double outerDiameter = preset.get(ComponentPreset.AFT_OUTER_DIAMETER);