use multimaint-merge to make Debian changelogs less ugly

[fw/altos] / altosui / AltosEepromDownload.java

diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index 6112a3b1cdce943febb0e87eb8b2d247ee71ad08..358ad337900e204435726f005cd529a299fc20ab 100644 (file)
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@ -275,7 +275,7 @@ public class AltosEepromDownload implements Runnable {
                for (block = log.start_block; !done && block < log.end_block; block++) {
                        monitor.set_value(Altos.state_to_string[state], state, block - state_block);
 
-                       AltosEepromChunk        eechunk = new AltosEepromChunk(serial_line, block);
+                       AltosEepromChunk        eechunk = new AltosEepromChunk(serial_line, block, block == log.start_block);
 
                        /*
                         * Guess what kind of data is there if the device
@@ -373,8 +373,12 @@ public class AltosEepromDownload implements Runnable {
                                     "Connection Failed",
                                     JOptionPane.ERROR_MESSAGE);
                } finally {
-                       if (remote)
-                               serial_line.stop_remote();
+                       if (remote) {
+                               try {
+                                       serial_line.stop_remote();
+                               } catch (InterruptedException ie) {
+                               }
+                       }
                        serial_line.flush_output();
                }
                monitor.done();