From 508b6a01e0ef2a526d2531111b0d9640dff740bf Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Thu, 31 Jan 2019 13:59:52 -0700
Subject: [PATCH] move the order around in the Run() loop

---
 QnetGateway.cpp |  2 +-
 QnetITAP.cpp    | 29 ++++++++++++++++-------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/QnetGateway.cpp b/QnetGateway.cpp
index 2cd583e..f1d8d66 100644
--- a/QnetGateway.cpp
+++ b/QnetGateway.cpp
@@ -422,7 +422,7 @@ void CQnetGateway::GetIRCDataThread()
 			if (doFind) {
 				printf("Finding Routes for...\n");
 				for (auto it=findRoute.begin(); it!=findRoute.end(); it++) {
-					std::this_thread::sleep_for(std::chrono::milliseconds(100));
+					std::this_thread::sleep_for(std::chrono::milliseconds(200));
 					printf("\t'%s'\n", it->c_str());
 					ii->findUser(*it);
 				}
diff --git a/QnetITAP.cpp b/QnetITAP.cpp
index ea4740d..e48a582 100644
--- a/QnetITAP.cpp
+++ b/QnetITAP.cpp
@@ -180,10 +180,12 @@ REPLY_TYPE CQnetITAP::GetITAPData(unsigned char *buf)
 			SendTo(ack_voice);
 			return RT_DATA;
 		case 0x21U:
-			if (acknowledged)
+			if (acknowledged) {
 				fprintf(stderr, "ERROR: Header already acknowledged!\n");
-			else
-				acknowledged = true;
+			} else {
+				if (0x0U == buf[2])
+					acknowledged = true;
+			}
 			return RT_HEADER_ACK;
 		case 0x23U:
 			if (acknowledged) {
@@ -218,15 +220,6 @@ void CQnetITAP::Run(const char *cfgfile)
 
 	while (keep_running) {
 
-		// send queued frames
-		if (acknowledged) {
-			if (! queue.empty()) {
-				CFrame frame = queue.front();
-				queue.pop();
-				SendTo(frame.data());
-				acknowledged = false;
-			}
-		}
 		fd_set readfds;
 		FD_ZERO(&readfds);
 		FD_SET(serfd, &readfds);
@@ -306,7 +299,17 @@ void CQnetITAP::Run(const char *cfgfile)
 			}
 			FD_CLR(ug2m, &readfds);
 		}
-	}
+
+		// send queued frames
+		if (keep_running && acknowledged) {
+			if (! queue.empty()) {
+				CFrame frame = queue.front();
+				queue.pop();
+				SendTo(frame.data());
+				acknowledged = false;
+			}
+		}
+}
 
 	close(serfd);
 	Gate2Modem.Close();