projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Bump library version
[fw/altos]
/
altosui
/
AltosFlashUI.java
diff --git
a/altosui/AltosFlashUI.java
b/altosui/AltosFlashUI.java
index e305d458a171fa388aa0ee2c1cfcfc286f1c9f63..5913e50699c2f390a597b1b828407476f608661f 100644
(file)
--- a/
altosui/AltosFlashUI.java
+++ b/
altosui/AltosFlashUI.java
@@
-23,7
+23,7
@@
import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
import java.io.*;
import java.util.concurrent.*;
import javax.swing.filechooser.FileNameExtensionFilter;
import java.io.*;
import java.util.concurrent.*;
-import org.altusmetrum.altoslib_
2
.*;
+import org.altusmetrum.altoslib_
3
.*;
import org.altusmetrum.altosuilib_1.*;
public class AltosFlashUI
import org.altusmetrum.altosuilib_1.*;
public class AltosFlashUI
@@
-365,7
+365,7
@@
public class AltosFlashUI
flash_task flasher;
flash_task flasher;
- private boolean open_device() {
+ private boolean open_device()
throws InterruptedException
{
try {
link = new AltosSerial(device);
if (is_pair_programmed())
try {
link = new AltosSerial(device);
if (is_pair_programmed())
@@
-408,8
+408,12
@@
public class AltosFlashUI
return;
if (!select_source_file())
return;
return;
if (!select_source_file())
return;
- if (!open_device())
+ try {
+ if (!open_device())
+ return;
+ } catch (InterruptedException ie) {
return;
return;
+ }
build_dialog();
flash_task f = new flash_task(this);
}
build_dialog();
flash_task f = new flash_task(this);
}