X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Frocketcomponent%2FExternalComponent.java;h=4377a8c31837718d3362be71390b4f001175433c;hb=92cb639463fcd6c3e7a8e8a68082b960861eeda7;hp=177fddc49a94c3ffa2607293d0a6917be11933af;hpb=b36c1b5d0d36625efc6329a93a64ed39e2330185;p=debian%2Fopenrocket diff --git a/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java b/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java index 177fddc4..4377a8c3 100644 --- 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()) {