X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosEepromDownload.java;h=64dcdff7032715bcf73977d5710257603f0d358a;hb=81bb6f42d8b859195ea5a35806c42d98ba82e8e1;hp=a42f401c50654d1683e903e29f27764b6960e7d4;hpb=7f49d694e776819e03b2c708e1c4ee23ba311430;p=fw%2Faltos

diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index a42f401c..64dcdff7 100644
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@ -155,9 +155,11 @@ public class AltosEepromDownload implements Runnable {
 				int	s = v ^ 0x8000;
 
 				if (Altos.ao_flight_startup <= s && s <= Altos.ao_flight_invalid) {
-					r = new AltosEepromRecord(Altos.AO_LOG_STATE, tiny_tick, s, 0);
-					if (s == Altos.ao_flight_landed)
+					state = s;
+					r = new AltosEepromRecord(Altos.AO_LOG_STATE, tiny_tick, state, 0);
+					if (state == Altos.ao_flight_landed)
 						done = true;
+					state = s;
 					any_valid = true;
 				} else {
 					if (v != 0xffff)
@@ -262,11 +264,11 @@ public class AltosEepromDownload implements Runnable {
 	}
 
 	public void run () {
-		if (remote)
-			serial_line.start_remote();
-
 		try {
 			boolean	failed = false;
+			if (remote)
+				serial_line.start_remote();
+
 			for (AltosEepromLog log : flights) {
 				parse_exception = null;
 				if (log.download) {
@@ -293,11 +295,12 @@ public class AltosEepromDownload implements Runnable {
 						   serial_line.device.toShortString()),
 				     "Connection Failed",
 				     JOptionPane.ERROR_MESSAGE);
+		} finally {
+			if (remote)
+				serial_line.stop_remote();
+			serial_line.flush_output();
 		}
-		if (remote)
-			serial_line.stop_remote();
 		monitor.done();
-		serial_line.flush_output();
 		if (listener != null) {
 			Runnable r = new Runnable() {
 					public void run() {