github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dont crash if the websocket's cancelTokenSource.Cancel throws an exception

Browse Source
This commit is contained in:
RogueException
2016-06-21 01:10:17 -03:00
parent b38455f427
commit ff806d5468
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Discord.Net/Net/WebSockets/DefaultWebsocketClient.cs
View File

@@ -72,17 +72,13 @@ namespace Discord.Net.WebSockets
public async Task DisconnectAsync() public async Task DisconnectAsync()
{ {
//Assume locked //Assume locked
_cancelTokenSource.Cancel(); try { _cancelTokenSource.Cancel(false); } catch { }
if (_client != null && _client.State == WebSocketState.Open) if (_client != null && _client.State == WebSocketState.Open)
{ {
try var task = _client?.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "", CancellationToken.None);
{ if (task != null)
var task = _client?.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "", CancellationToken.None); await task.ConfigureAwait(false);
if (task != null)
await task.ConfigureAwait(false);
}
catch { }
} }
await (_task ?? Task.CompletedTask).ConfigureAwait(false); await (_task ?? Task.CompletedTask).ConfigureAwait(false);