X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfigTD.java;h=cd20a174300c822d70362f541fbdd09d2eed800c;hp=4389e49b0c57ac431512a5544b3243441390afa0;hb=356617a3476e237311b8bbcefd6beda8271b120d;hpb=95f3a2825377bdb6737446df051c069d58f42d08

diff --git a/altosui/AltosConfigTD.java b/altosui/AltosConfigTD.java
index 4389e49b..cd20a174 100644
--- 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 org.altusmetrum.altoslib_5.*;
-import org.altusmetrum.altosuilib_3.*;
+import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altosuilib_6.*;
 
 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;
-					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) {
 			}
@@ -277,8 +279,10 @@ public class AltosConfigTD implements ActionListener {
 	}
 
 	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()),