*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_11;
import java.io.*;
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
+}