[Fix] Disconnecting socket client does not send close code (#2714)

* fix? * whoops, debugging stuff
2023-08-10 16:19:10 +03:00
parent d5d7378e02
commit 6bb3777bf9
2 changed files with 19 additions and 9 deletions
--- a/src/Discord.Net.WebSocket/Net/DefaultWebSocketClient.cs
+++ b/src/Discord.Net.WebSocket/Net/DefaultWebSocketClient.cs
@@ -110,9 +110,6 @@ namespace Discord.Net.WebSockets
        {
            _isDisconnecting = true;

-            try
-            { _disconnectTokenSource.Cancel(false); }
-            catch { }

            if (_client != null)
            {
@@ -120,11 +117,22 @@ namespace Discord.Net.WebSockets
                {
                    var status = (WebSocketCloseStatus)closeCode;
                    try
-                    { await _client.CloseOutputAsync(status, "", new CancellationToken()); }
+                    {
+                        await _client.CloseOutputAsync(status, "", new CancellationToken());
+                    }
                    catch { }
                }
+
                try
-                { _client.Dispose(); }
+                {
+                    _client.Dispose();
+                }
+                catch { }
+
+                try
+                {
+                    _disconnectTokenSource.Cancel(false);
+                }
                catch { }

                _client = null;