fixed a bug in usb worker

A-J-Bauer · Feb 6, 2024 · 2eca252 · 2eca252
1 parent c5f39c2
commit 2eca252
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/Sharpi/Sharpi.csproj b/Sharpi/Sharpi.csproj
@@ -12,9 +12,9 @@
 		<Description>C# Library for 64 bit Raspberry Pi OS</Description>
 		<Copyright>A.J.Bauer</Copyright>
 		<PackageIcon>img\sharpi.png</PackageIcon>		
-		<AssemblyVersion>1.0.4.1</AssemblyVersion>
-		<FileVersion>1.0.4.1</FileVersion>
-		<Version>1.0.4.1</Version>
+		<AssemblyVersion>1.0.4.2</AssemblyVersion>
+		<FileVersion>1.0.4.2</FileVersion>
+		<Version>1.0.4.2</Version>
 		<PackageReadmeFile></PackageReadmeFile>
 		<PackageTags>Raspberry;Pi;iot;</PackageTags>
 		<PackageProjectUrl>https://github.com/A-J-Bauer/sharpi</PackageProjectUrl>

diff --git a/Sharpi/cpp/sharpi/UsbWorker.cpp b/Sharpi/cpp/sharpi/UsbWorker.cpp
@@ -365,12 +365,16 @@ void UsbWorker::work(int deviceId, unsigned int baud, int deadAfterMs)
 				fd = -1;
 			}
 
+			if (stop)
+			{
+				break;
+			}
+
 			mtxState.lock();
 			UsbWorker::ttyDevs[ttyDevCount].state = UsbWorker::TtyDevState::Unused;
 			mtxState.unlock();
 
 			ttyDevCount = (ttyDevCount + 1) % UsbWorker::ttyDevsSize;
 		}
-
 	}
 }
diff --git a/Sharpi/cpp/sharpi/UsbWorker.h b/Sharpi/cpp/sharpi/UsbWorker.h
@@ -16,7 +16,6 @@
 #include <termios.h> //POSIX terminal control definitions
 #include <unistd.h> // write(), read(), close()
 #include <errno.h>
-//#include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>

diff --git a/Sharpi/native/libsharpi.so b/Sharpi/native/libsharpi.so