create changelog entry

[debian/openrocket] / core / src / net / sf / openrocket / preset / loader / StreamerLoader.java

diff --git a/core/src/net/sf/openrocket/preset/loader/StreamerLoader.java b/core/src/net/sf/openrocket/preset/loader/StreamerLoader.java
index 652b2d42fc1e5339e4b31d02ce6ef7003a22b5cc..403ea0f6e28b980e0a59a28b10ef51be0070af3c 100644 (file)
--- a/core/src/net/sf/openrocket/preset/loader/StreamerLoader.java
+++ b/core/src/net/sf/openrocket/preset/loader/StreamerLoader.java
@@ -49,11 +49,11 @@ public class StreamerLoader extends BaseComponentLoader {
 
                // Fix the material since some files use bulk materials for streamers.
                Double thickness = props.get( ComponentPreset.THICKNESS );
-               Material.Surface material = (Material.Surface) props.get( ComponentPreset.MATERIAL );
+               Material.Surface myMaterial = (Material.Surface) props.get( ComponentPreset.MATERIAL );
 
-               material = materials.getSurfaceMaterial(material, thickness);
+               Material.Surface m = materials.getSurfaceMaterial(myMaterial, thickness);
 
-               props.put(ComponentPreset.MATERIAL, material);
+               props.put(ComponentPreset.MATERIAL, m!=null? m : myMaterial);
        }
 
 }