From dba29e9f356ce38b0fd5c244a83cde7e8e944d14 Mon Sep 17 00:00:00 2001
From: Paulo <pnmanjos@hotmail.com>
Date: Sun, 31 Jan 2021 03:04:48 -0300
Subject: [PATCH] Don't wait ready before releasing semaphore

---
 .../DiscordSocketClient.cs                    | 43 +++++++------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
index 35262fd8f..b43db5d98 100644
--- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
@@ -245,15 +245,15 @@ namespace Discord.WebSocket
                     await _gatewayLogger.DebugAsync("Identifying").ConfigureAwait(false);
                     await ApiClient.SendIdentifyAsync(shardID: ShardId, totalShards: TotalShards, guildSubscriptions: _guildSubscriptions, gatewayIntents: _gatewayIntents, presence: BuildCurrentStatus()).ConfigureAwait(false);
                 }
-
-                //Wait for READY
-                await _connection.WaitAsync().ConfigureAwait(false);
             }
             finally
             {
                 if (locked)
                     _shardedClient.ReleaseIdentifyLock();
             }
+
+            //Wait for READY
+            await _connection.WaitAsync().ConfigureAwait(false);
         }
         private async Task OnDisconnectingAsync(Exception ex)
         {
@@ -554,36 +554,25 @@ namespace Discord.WebSocket
                     case GatewayOpCode.InvalidSession:
                         {
                             await _gatewayLogger.DebugAsync("Received InvalidSession").ConfigureAwait(false);
+                            await _gatewayLogger.WarningAsync("Failed to resume previous session").ConfigureAwait(false);
 
-                            if (_sessionId != null)
-                            {
-                                // Failed to resume
-                                await _gatewayLogger.WarningAsync("Failed to resume previous session").ConfigureAwait(false);
+                            _sessionId = null;
+                            _lastSeq = 0;
 
-                                _sessionId = null;
-                                _lastSeq = 0;
-
-                                if (_shardedClient != null)
+                            if (_shardedClient != null)
+                            {
+                                await _shardedClient.AcquireIdentifyLockAsync(ShardId, _connection.CancelToken).ConfigureAwait(false);
+                                try
                                 {
-                                    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);
+                                }
+                                finally
+                                {
+                                    _shardedClient.ReleaseIdentifyLock();
+                                }
                             }
                             else
-                            {
-                                // Failed to identify
-                                await _gatewayLogger.WarningAsync("Failed to identify").ConfigureAwait(false);
                                 await ApiClient.SendIdentifyAsync(shardID: ShardId, totalShards: TotalShards, guildSubscriptions: _guildSubscriptions, gatewayIntents: _gatewayIntents, presence: BuildCurrentStatus()).ConfigureAwait(false);
-                            }
                         }
                         break;
                     case GatewayOpCode.Reconnect:
@@ -643,7 +632,7 @@ namespace Discord.WebSocket
                                             }
                                             else if (_connection.CancelToken.IsCancellationRequested)
                                                 return;
-                                            
+
                                             if (BaseConfig.AlwaysDownloadUsers)
                                                 _ = DownloadUsersAsync(Guilds.Where(x => x.IsAvailable && !x.HasAllMembers));