Updates for 0.9.5

[debian/openrocket] / src / net / sf / openrocket / gui / adaptors / MaterialModel.java

diff --git a/src/net/sf/openrocket/gui/adaptors/MaterialModel.java b/src/net/sf/openrocket/gui/adaptors/MaterialModel.java
index be8df36eb4a762492949e8a71127c2dc1ca2f404..1defc447e422bfbdd418523f19e4ccb9e19210ea 100644 (file)
--- a/src/net/sf/openrocket/gui/adaptors/MaterialModel.java
+++ b/src/net/sf/openrocket/gui/adaptors/MaterialModel.java
@@ -80,6 +80,11 @@ public class MaterialModel extends AbstractListModel implements
 
        @Override
        public void setSelectedItem(Object item) {
+               if (item == null) {
+                       // Clear selection - huh?
+                       return;
+               }
+
                if (item == CUSTOM) {
                        
                        // Open custom material dialog in the future, after combo box has closed