From a694784abca8d5b2485f8a6eb76e5c2fcd444674 Mon Sep 17 00:00:00 2001 From: Samuel Date: Wed, 8 Mar 2017 16:14:01 +0100 Subject: [PATCH] Fixed unhandled exception when cancel is called on the CancellationToken --- websocket-sharp.clone/WebSocket.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/websocket-sharp.clone/WebSocket.cs b/websocket-sharp.clone/WebSocket.cs index 64f835cf6..ebc6477d5 100644 --- a/websocket-sharp.clone/WebSocket.cs +++ b/websocket-sharp.clone/WebSocket.cs @@ -200,7 +200,18 @@ public class WebSocket : IDisposable _onClose = onClose ?? (c => AsyncEx.Completed()); _sslConfig = sslAuthConfiguration; _cancellationToken = cancellationToken; - _registration = _cancellationToken.Register(async () => await Close().ConfigureAwait(false)); + _registration = _cancellationToken.Register( + async () => + { + try + { + await Close().ConfigureAwait(false); + } + catch (TaskCanceledException) + { + // ignore + } + }); _base64Key = CreateBase64Key(); _client = true; _secure = _uri.Scheme == "wss";