From: Bill Kuker <bkuker@billkuker.com>
Date: Thu, 16 Feb 2012 21:20:35 +0000 (+0000)
Subject: Stop processing a burn on motor close
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=0ccf63cf496d22cbd99d6604d2c883d3d2e2a632;hp=4d75b0e6c3eb281d2199bf40ca3796939ef0603b;p=sw%2Fmotorsim

Stop processing a burn on motor close
---

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index 3df2ceb..c71e2fd 100644
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@ -77,6 +77,7 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
 	SummaryPanel sp;
 	JTextArea error;
 	JTabbedPane tabs;
+	boolean closed = false;
 
 	private Vector<BurnWatcher> burnWatchers = new Vector<BurnWatcher>();
 	private DefaultComboBoxModel availableFuels = new DefaultComboBoxModel();
@@ -171,6 +172,11 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
 									@Override
 									public void setProgress(float f) {
 										if ( currentThread != me ){
+											log.info("Cancel burn on change");
+											throw new BurnCanceled();
+										}
+										if ( closed ){
+											log.info("Cancel burn on close");
 											throw new BurnCanceled();
 										}
 									}
diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorsEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorsEditor.java
index 90c6800..63d8156 100644
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorsEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorsEditor.java
@@ -137,6 +137,7 @@ public class MotorsEditor extends MultiObjectEditor<Motor, MotorEditor> {
 		mpc.removeBurn(e.burn);
 		mmt.removeBurn(e.burn);
 		rst.replace(e.burn, null);
+		e.closed = true;
 	}
 
 	@Override