projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Delay TRNG ADC long enough for HV supply to stabilize
[fw/altos]
/
altosui
/
AltosConfigTD.java
diff --git
a/altosui/AltosConfigTD.java
b/altosui/AltosConfigTD.java
index 4389e49b0c57ac431512a5544b3243441390afa0..3958a013b948d6a39399996373f7b9f7ceeb436a 100644
(file)
--- a/
altosui/AltosConfigTD.java
+++ b/
altosui/AltosConfigTD.java
@@
-21,8
+21,8
@@
import java.awt.event.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
-import org.altusmetrum.altoslib_
5
.*;
-import org.altusmetrum.altosuilib_
3
.*;
+import org.altusmetrum.altoslib_
9
.*;
+import org.altusmetrum.altosuilib_
9
.*;
public class AltosConfigTD implements ActionListener {
public class AltosConfigTD implements ActionListener {
@@
-223,8
+223,10
@@
public class AltosConfigTD implements ActionListener {
if (!config_version.get().equals("0.0"))
break;
been_there = true;
if (!config_version.get().equals("0.0"))
break;
been_there = true;
- config.serial_line.printf("C\n ");
- config.serial_line.flush_input();
+ if (config != null && config.serial_line != null) {
+ config.serial_line.printf("C\n ");
+ config.serial_line.flush_input();
+ }
}
} catch (InterruptedException ie) {
}
}
} catch (InterruptedException ie) {
}
@@
-277,8
+279,10
@@
public class AltosConfigTD implements ActionListener {
}
void abort() {
}
void abort() {
- serial_line.close();
- serial_line = null;
+ if (serial_line != null) {
+ serial_line.close();
+ serial_line = null;
+ }
JOptionPane.showMessageDialog(owner,
String.format("Connection to \"%s\" failed",
device.toShortString()),
JOptionPane.showMessageDialog(owner,
String.format("Connection to \"%s\" failed",
device.toShortString()),