From 6f5a1485126c48e0ecc1e967edab5d2b35394e20 Mon Sep 17 00:00:00 2001
From: ComputerMaster1st <mr_m.a_thompson@hotmail.co.uk>
Date: Sun, 11 Nov 2018 11:49:39 +0000
Subject: [PATCH] Merge fix

---
 src/Discord.Net.WebSocket/DiscordSocketClient.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
index 14423c1f0..d347bd6a6 100644
--- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
@@ -251,14 +251,11 @@ namespace Discord.WebSocket
                 await heartbeatTask.ConfigureAwait(false);
             _heartbeatTask = null;
 
-            // Check if hearbeatTimes is not empty before dequeuing. TryDequeue can cause blocking.
             if (!_heartbeatTimes.IsEmpty) while (_heartbeatTimes.TryDequeue(out long time)) { }
-            _lastMessageTime = 0;
 
             await _gatewayLogger.DebugAsync("Waiting for guild downloader").ConfigureAwait(false);
-            var guildDownloadTask = _guildDownloadTask;
-            if (guildDownloadTask != null)
-                await guildDownloadTask.ConfigureAwait(false);
+            if (_guildDownloadTask != null)
+                await _guildDownloadTask.ConfigureAwait(false);
             _guildDownloadTask = null;
 
             //Clear large guild queue