DarthAffe/OBD.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/OBD.NET.git synced 2025-12-12 16:58:30 +00:00
Code Issues Releases Wiki Activity

Fix deadlock on connection lost

Browse Source
This commit is contained in:
Malte Bitter 2021-09-16 11:39:34 +02:00
parent d214f87fff
commit 34940632a3
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OBD.NET/OBD.NET.Common/Devices/SerialDevice.cs
View File

@ -217,11 +217,23 @@ namespace OBD.NET.Common.Devices
else else
Connection.Write(Encoding.ASCII.GetBytes(CurrentCommand.CommandText)); Connection.Write(Encoding.ASCII.GetBytes(CurrentCommand.CommandText));
//wait for command to finish //wait for command to finish or command canceled
_commandFinishedEvent.WaitOne(); while (!(_commandFinishedEvent.WaitOne(50) || _commandCancellationToken.IsCancellationRequested))
{
}
} }
} }
catch (OperationCanceledException) { /*ignore, because it is thrown when the cancellation token is canceled*/} catch (OperationCanceledException) { /*ignore, because it is thrown when the cancellation token is canceled*/}
// if canceled set all commands as completed (with null result)
if (_commandCancellationToken.IsCancellationRequested)
{
CurrentCommand?.CommandResult.WaitHandle.Set();
foreach (var cmd in _commandQueue)
{
cmd.CommandResult.WaitHandle.Set();
}
}
} }
} }