summaryrefslogtreecommitdiff
path: root/altoslib/AltosLink.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2014-10-30 21:59:45 -0700
committerKeith Packard <keithp@keithp.com>2014-10-30 21:59:45 -0700
commitb0e903a76276e33f531eade42ac721c9490c6758 (patch)
treeafdb7cb33056227b57f738ce4c18c2cf6ad011e1 /altoslib/AltosLink.java
parentef00182c79bd7a56fbc5d782cb8f4aa0079bb86f (diff)
altosui: Pop up 'Connecting' dialog during Monitor Idle
This was a bit harder than expected as I had to wire up a way to shut down the whole monitor idle window when you clicked on the cancel button. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosLink.java')
-rw-r--r--altoslib/AltosLink.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/altoslib/AltosLink.java b/altoslib/AltosLink.java
index c0031cad..639d2ac7 100644
--- a/altoslib/AltosLink.java
+++ b/altoslib/AltosLink.java
@@ -427,8 +427,10 @@ public abstract class AltosLink implements Runnable {
public void set_callsign(String callsign) {
this.callsign = callsign;
- printf ("c c %s\n", callsign);
- flush_output();
+ if (callsign != null) {
+ printf ("c c %s\n", callsign);
+ flush_output();
+ }
}
public boolean is_loader() throws InterruptedException {
@@ -467,7 +469,7 @@ public abstract class AltosLink implements Runnable {
if (telemetry_rate < 0)
telemetry_rate = AltosPreferences.telemetry_rate(serial);
set_telemetry_rate(telemetry_rate);
- if (callsign.equals(""))
+ if (callsign == null || callsign.equals(""))
callsign = AltosPreferences.callsign();
set_callsign(callsign);
printf("p\nE 0\n");