From 41fa91f01e66e37d2b524084ed350cc2fdae2968 Mon Sep 17 00:00:00 2001
From: yebafan <adass5202@gmail.com>
Date: Sun, 31 Jan 2021 01:46:28 +0100
Subject: [PATCH] fixed a deadlock in DiscordShardedClient during a failed
 Identify due to InvalidSession

---
 .../DiscordSocketClient.cs                    | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
index d4c96ab26..96c043195 100644
--- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
@@ -554,25 +554,36 @@ namespace Discord.WebSocket
                     case GatewayOpCode.InvalidSession:
                         {
                             await _gatewayLogger.DebugAsync("Received InvalidSession").ConfigureAwait(false);
-                            await _gatewayLogger.WarningAsync("Failed to resume previous session").ConfigureAwait(false);
 
-                            _sessionId = null;
-                            _lastSeq = 0;
-
-                            if (_shardedClient != null)
+                            if (_sessionId != null)
                             {
-                                await _shardedClient.AcquireIdentifyLockAsync(ShardId, _connection.CancelToken).ConfigureAwait(false);
-                                try
-                                {
-                                    await ApiClient.SendIdentifyAsync(shardID: ShardId, totalShards: TotalShards, guildSubscriptions: _guildSubscriptions, gatewayIntents: _gatewayIntents, presence: BuildCurrentStatus()).ConfigureAwait(false);
-                                }
-                                finally
+                                // Failed to resume
+                                await _gatewayLogger.WarningAsync("Failed to resume previous session").ConfigureAwait(false);
+
+                                _sessionId = null;
+                                _lastSeq = 0;
+
+                                if (_shardedClient != null)
                                 {
-                                    _shardedClient.ReleaseIdentifyLock();
+                                    await _shardedClient.AcquireIdentifyLockAsync(ShardId, _connection.CancelToken).ConfigureAwait(false);
+                                    try
+                                    {
+                                        await ApiClient.SendIdentifyAsync(shardID: ShardId, totalShards: TotalShards, guildSubscriptions: _guildSubscriptions, gatewayIntents: _gatewayIntents, presence: BuildCurrentStatus()).ConfigureAwait(false);
+                                    }
+                                    finally
+                                    {
+                                        _shardedClient.ReleaseIdentifyLock();
+                                    }
                                 }
+                                else
+                                    await ApiClient.SendIdentifyAsync(shardID: ShardId, totalShards: TotalShards, guildSubscriptions: _guildSubscriptions, gatewayIntents: _gatewayIntents, presence: BuildCurrentStatus()).ConfigureAwait(false);
                             }
                             else
+                            {
+                                // Failed to identify
+                                await _gatewayLogger.WarningAsync("Failed to resume previous session").ConfigureAwait(false);
                                 await ApiClient.SendIdentifyAsync(shardID: ShardId, totalShards: TotalShards, guildSubscriptions: _guildSubscriptions, gatewayIntents: _gatewayIntents, presence: BuildCurrentStatus()).ConfigureAwait(false);
+                            }
                         }
                         break;
                     case GatewayOpCode.Reconnect: