altosui: Interrupt MonitorIdle when changing frequency/callsign

[fw/altos] / altosui / AltosIdleMonitorUI.java

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 462bff181a3613fa4783162d9742b2f51cde842c..8c883eebfc0cd8a5fdda2cf44d9e8095824c96e3 100644 (file)
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -37,11 +37,8 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
        boolean                 remote;
 
        void stop_display() {
-               if (thread != null && thread.isAlive()) {
-                       thread.interrupt();
-                       try {
-                               thread.join();
-                       } catch (InterruptedException ie) {}
+               if (thread != null) {
+                       thread.abort();
                }
                thread = null;
        }
@@ -92,8 +89,11 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 
        /* DocumentListener interface methods */
        public void changedUpdate(DocumentEvent e) {
-               if (callsign_value != null)
-                       AltosUIPreferences.set_callsign(callsign_value.getText());
+               if (callsign_value != null) {
+                       String  callsign = callsign_value.getText();
+                       thread.set_callsign(callsign);
+                       AltosUIPreferences.set_callsign(callsign);
+               }
        }
 
        public void insertUpdate(DocumentEvent e) {