From: Keith Packard <keithp@keithp.com>
Date: Wed, 24 Nov 2010 03:04:55 +0000 (-0800)
Subject: altosui: Make AltosSerial.flush_input keep reading while non-empty
X-Git-Tag: debian/0.7.1+168+gcb08bc2~15^2~10
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=ed7cf7d262fcf7c0c677c2fb981582b571de9e5e

altosui: Make AltosSerial.flush_input keep reading while non-empty

Flushing the input buffer can take a while, especially over the packet
link. Keep reading while stuff is appearing on the reply queue.

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

diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index ab74486b..8a6ad05e 100644
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -114,16 +114,20 @@ public class AltosSerial implements Runnable {
 
 	public void flush_input() {
 		flush_output();
-		try {
-			Thread.sleep(200);
-		} catch (InterruptedException ie) {
-		}
-		synchronized(this) {
-			if (!"VERSION".startsWith(line) &&
-			    !line.startsWith("VERSION"))
-				line = "";
-			reply_queue.clear();
-		}
+		boolean	got_some;
+		do {
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException ie) {
+			}
+			got_some = !reply_queue.isEmpty();
+			synchronized(this) {
+				if (!"VERSION".startsWith(line) &&
+				    !line.startsWith("VERSION"))
+					line = "";
+				reply_queue.clear();
+			}
+		} while (got_some);
 	}
 
 	public String get_reply() throws InterruptedException {