Merge

OBD.NET/OBD.NET.Common/Devices/SerialDevice.cs

@@ -204,6 +204,8 @@ namespace OBD.NET.Common.Devices
                 if (_queueSize == 0)
                     _queueEmptyEvent.Set();
 
+                try
+                {
                     if (_commandQueue.TryTake(out CurrentCommand, 10, _commandCancellationToken.Token))
                     {
                         _queueSize--;
@@ -219,6 +221,8 @@ namespace OBD.NET.Common.Devices
                         _commandFinishedEvent.WaitOne();
                     }
                 }
+                catch (OperationCanceledException) { /*ignore, because it is thrown when the cancellation token is canceled*/}
+            }
         }
 
         public void WaitQueue() => _queueEmptyEvent.WaitOne();
@@ -230,9 +234,9 @@ namespace OBD.NET.Common.Devices
         /// </summary>
         public virtual void Dispose()
         {
+            _commandQueue.CompleteAdding();
             _commandCancellationToken?.Cancel();
             _commandWorkerTask?.Wait();
-
             Connection?.Dispose();
         }