X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosLink.java;h=639d2ac784a4f63642a5310ec1aef91658a38b36;hp=c0031cadbf059ce3ea38c6e102901dac1be79e9d;hb=b0e903a76276e33f531eade42ac721c9490c6758;hpb=ef00182c79bd7a56fbc5d782cb8f4aa0079bb86f

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");