Fixing breadcrumbs server after data sync thread changes

grf14003 · Jan 29, 2020 · dc5f87d · dc5f87d
1 parent a53e2bc
commit dc5f87d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/breadcrumbs/src/comms/DataSyncThread.cpp b/breadcrumbs/src/comms/DataSyncThread.cpp
@@ -54,8 +54,7 @@ void DataSyncThread::threadRuntime()
 		attribMutex = NULL;
 	}
 
-	WSACleanup();
-	printf("Done running thread!");
+	printf("Done running data sync thread!\n");
 	threadRunning = false;
 }
 
@@ -69,7 +68,10 @@ bool DataSyncThread::readyToReceive(int interval)
 	tv.tv_sec = interval;
 	tv.tv_usec = 0;
 
-	return (select(sock + 1, &fds, 0, 0, &tv) == 1);
+	bool result = select(sock + 1, &fds, 0, 0, &tv) == 1;
+	if (FD_ISSET(sock, &fds))
+		return true;
+	return result;
 }
 
 int DataSyncThread::recvBytes(void* buffer, size_t numBytes)

diff --git a/breadcrumbs/src/main/VirtualOutputProcessor.cpp b/breadcrumbs/src/main/VirtualOutputProcessor.cpp
@@ -17,6 +17,7 @@ int main()
 	}
 
 	client.stopComms();
+	WSACleanup();
 
 	return 0;
 }