X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosEepromDelete.java;h=df2ade786ad6e363bc3ba04b29bdadb4536d76c6;hp=94951ced3758c66be524b980643d394accb98fe8;hb=9a4c2c7fc6af922d052e23a1b99bf847fbf9b0e9;hpb=0e3e4f9c1e6a6bf972514f12c9d622258aa2aec2

diff --git a/altosui/AltosEepromDelete.java b/altosui/AltosEepromDelete.java
index 94951ced..df2ade78 100644
--- a/altosui/AltosEepromDelete.java
+++ b/altosui/AltosEepromDelete.java
@@ -17,18 +17,12 @@
 
 package altosui;
 
-import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
-
-import libaltosJNI.*;
+import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_4.*;
 
 public class AltosEepromDelete implements Runnable {
 	AltosEepromList		flights;
@@ -42,7 +36,7 @@ public class AltosEepromDelete implements Runnable {
 	private void DeleteLog (AltosEepromLog log)
 		throws IOException, InterruptedException, TimeoutException {
 
-		if (flights.config_data.flight_log_max != 0) {
+		if (flights.config_data.flight_log_max != 0 || flights.config_data.log_format != 0) {
 
 			/* Devices with newer firmware can erase the
 			 * flash blocks containing each flight
@@ -90,7 +84,7 @@ public class AltosEepromDelete implements Runnable {
 				serial_line.start_remote();
 
 			for (AltosEepromLog log : flights) {
-				if (log.delete) {
+				if (log.selected) {
 					DeleteLog(log);
 				}
 			}
@@ -104,10 +98,14 @@ public class AltosEepromDelete implements Runnable {
 						  serial_line.device.toShortString()),
 				    "Connection Failed");
 		} finally {
-			if (remote)
-				serial_line.stop_remote();
-			serial_line.flush_output();
-			serial_line.close();
+			try {
+				if (remote)
+					serial_line.stop_remote();
+			} catch (InterruptedException ie) {
+			} finally {
+				serial_line.flush_output();
+				serial_line.close();
+			}
 		}
 		if (listener != null) {
 			Runnable r = new Runnable() {
@@ -143,4 +141,4 @@ public class AltosEepromDelete implements Runnable {
 		flights = given_flights;
 		success = false;
 	}
-}
\ No newline at end of file
+}