From ff806d5468d3150d5a1bd153c3b4ec8516ce125f Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Tue, 21 Jun 2016 01:10:17 -0300
Subject: [PATCH] Dont crash if the websocket's cancelTokenSource.Cancel throws
 an exception

---
 src/Discord.Net/Net/WebSockets/DefaultWebsocketClient.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

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