altosui: Simple timeouts don't work with query data

To get the query to come back, it's best to abort and retry the
command, other wise the command may have been lost to the previous
connection.

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index 8f8f99d7..cb82a574 100644
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -233,12 +233,14 @@ public class AltosSerial implements Runnable {
 		abort = false;
 		timeout_started = false;
 		for (;;) {
+			System.out.printf("timeout %d\n", timeout);
 			AltosLine line = reply_queue.poll(timeout, TimeUnit.MILLISECONDS);
 			if (line != null) {
 				stop_timeout_dialog();
 				--in_reply;
 				return line.line;
 			}
+			System.out.printf("no line remote %b can_cancel %b\n", remote, can_cancel);
 			if (!remote || !can_cancel || check_timeout()) {
 				--in_reply;
 				return null;
@@ -246,6 +248,14 @@ public class AltosSerial implements Runnable {
 		}
 	}
 
+	public String get_reply_no_dialog(int timeout) throws InterruptedException, TimeoutException {
+		flush_output();
+		AltosLine line = reply_queue.poll(timeout, TimeUnit.MILLISECONDS);
+		if (line != null)
+			return line.line;
+		return null;
+	}
+
 	public void add_monitor(LinkedBlockingQueue<AltosLine> q) {
 		set_monitor(true);
 		monitors.add(q);