X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fadaptors%2FMotorConfigurationModel.java;h=5c01348747136b6b51432686772c313d490a34de;hb=c72e1c03cc0d15e11368707c38721d506ce356b9;hp=92e8473948e0f5aa6214d40f928e359078b2d615;hpb=4b214bb1bdbcbe40d47c16c380715ed0b5095d64;p=debian%2Fopenrocket

diff --git a/src/net/sf/openrocket/gui/adaptors/MotorConfigurationModel.java b/src/net/sf/openrocket/gui/adaptors/MotorConfigurationModel.java
index 92e84739..5c013487 100644
--- a/src/net/sf/openrocket/gui/adaptors/MotorConfigurationModel.java
+++ b/src/net/sf/openrocket/gui/adaptors/MotorConfigurationModel.java
@@ -63,6 +63,10 @@ public class MotorConfigurationModel implements ComboBoxModel, ChangeListener {
 
 	@Override
 	public void setSelectedItem(Object item) {
+		if (item == null) {
+			// Clear selection - huh?
+			return;
+		}
 		if (item == EDIT) {
 			
 			// Open edit dialog in the future, after combo box has closed
@@ -76,8 +80,9 @@ public class MotorConfigurationModel implements ComboBoxModel, ChangeListener {
 
 			return;
 		}
-		if (!(item instanceof ID))
-			return;
+		if (!(item instanceof ID)) {
+			throw new IllegalArgumentException("MotorConfigurationModel item="+item);
+		}
 		
 		ID idObject = (ID) item;
 		config.setMotorConfigurationID(idObject.getID());