X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosFlash.java;h=95ea73b593626fd7c465b8a3286ffa1309b7a80c;hb=cb23b992be8ba40c97d8988c134a814a13ccd58c;hp=8e8722c2727dec1b343b5127fbb28ab57183c632;hpb=f0216d721ed13f4d3dc608bb6ad8f83732b27c0a;p=fw%2Faltos

diff --git a/altoslib/AltosFlash.java b/altoslib/AltosFlash.java
index 8e8722c2..95ea73b5 100644
--- a/altoslib/AltosFlash.java
+++ b/altoslib/AltosFlash.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_4;
+package org.altusmetrum.altoslib_7;
 
 import java.io.*;
 
@@ -345,9 +345,23 @@ public class AltosFlash extends AltosProgrammer {
 			debug = new AltosDebug(link);
 		input = new FileInputStream(file);
 		image = new AltosHexfile(input);
-		if (debug != null && !debug.check_connection()) {
+
+		boolean connection_ok = true;
+
+		if (debug != null) {
+			try {
+				connection_ok = debug.check_connection();
+			} catch (IOException ie) {
+				debug.close();
+				throw ie;
+			} catch (InterruptedException ie) {
+				debug.close();
+				throw ie;
+			}
+		}
+		if (!connection_ok) {
 			debug.close();
 			throw new IOException("Debug port not connected");
 		}
 	}
-}
\ No newline at end of file
+}