Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / src / net / sf / openrocket / rocketcomponent / ExternalComponent.java

diff --git a/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java b/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java
index 177fddc49a94c3ffa2607293d0a6917be11933af..4377a8c31837718d3362be71390b4f001175433c 100644 (file)
--- a/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java
@@ -113,7 +113,6 @@ public abstract class ExternalComponent extends RocketComponent {
                material = mat;
                clearPreset();
                fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE);
-               clearPreset();
        }
 
        public Finish getFinish() {
@@ -137,7 +136,7 @@ public abstract class ExternalComponent extends RocketComponent {
                if ( preset.has(ComponentPreset.MATERIAL ) ) {
                        Material mat = preset.get(ComponentPreset.MATERIAL);
                        if ( mat != null ) {
-                               setMaterial(mat);
+                               material = mat;
                        } /*
                        TODO - 
                        else if (c.isMassOverridden()) {