From 540345279ab44bf9eef78e71061d4d78a0429361 Mon Sep 17 00:00:00 2001
From: ComputerMaster1st <mr_m.a_thompson@hotmail.co.uk>
Date: Mon, 27 Aug 2018 14:22:02 +0100
Subject: [PATCH] Disconnecting block fix

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

diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
index 3d260d1a6..4a54545b5 100644
--- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
@@ -251,7 +251,12 @@ namespace Discord.WebSocket
                 await heartbeatTask.ConfigureAwait(false);
             _heartbeatTask = null;
 
+<<<<<<< HEAD
             while (_heartbeatTimes.TryDequeue(out _)) { }
+=======
+            // Check if hearbeatTimes is not empty before dequeuing. TryDequeue can cause blocking.
+            if (!_heartbeatTimes.IsEmpty) while (_heartbeatTimes.TryDequeue(out long time)) { }
+>>>>>>> Disconnecting block fix
             _lastMessageTime = 0;
 
             await _gatewayLogger.DebugAsync("Waiting for guild downloader").ConfigureAwait(false);