X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=e63a004c67c5f5ef2e747da9373c2259f3ae50b5;hp=e3f613037dc61eab425d2a1becf9a0d735be0ce7;hb=71191ecef3ba0e00d0f8a7cd1a24982bfa44ec72;hpb=e5ef42c2b22c6639d90631dbbb588f9fd2494385

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index e3f61303..e63a004c 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -441,6 +441,7 @@ public class AltosUI extends JFrame {
 
 		if (device != null) {
 			try {
+				stop_display();
 				serial_line.open(device);
 				DeviceThread thread = new DeviceThread(serial_line);
 				serial_line.set_channel(AltosPreferences.channel());
@@ -536,8 +537,12 @@ public class AltosUI extends JFrame {
 	Thread		display_thread;
 
 	private void stop_display() {
-		if (display_thread != null && display_thread.isAlive())
+		if (display_thread != null && display_thread.isAlive()) {
 			display_thread.interrupt();
+			try {
+				display_thread.join();
+			} catch (InterruptedException ie) {}
+		}
 		display_thread = null;
 	}