X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fadaptors%2FMaterialModel.java;fp=src%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fadaptors%2FMaterialModel.java;h=1defc447e422bfbdd418523f19e4ccb9e19210ea;hb=c72e1c03cc0d15e11368707c38721d506ce356b9;hp=be8df36eb4a762492949e8a71127c2dc1ca2f404;hpb=d23932f311312abb73801262a80ef2f6bc66818d;p=debian%2Fopenrocket

diff --git a/src/net/sf/openrocket/gui/adaptors/MaterialModel.java b/src/net/sf/openrocket/gui/adaptors/MaterialModel.java
index be8df36e..1defc447 100644
--- 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