From 99703d2f1654807f6ae1e1578ccef30afc14c1e5 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Thu, 14 Jul 2016 14:12:16 -0300
Subject: [PATCH] Start heartbeating immediately after receiving HELLO

---
 src/Discord.Net/DiscordSocketClient.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Discord.Net/DiscordSocketClient.cs b/src/Discord.Net/DiscordSocketClient.cs
index cc9040cdb..da21aa7a6 100644
--- a/src/Discord.Net/DiscordSocketClient.cs
+++ b/src/Discord.Net/DiscordSocketClient.cs
@@ -1239,8 +1239,6 @@ namespace Discord
                 await logger.DebugAsync("Heartbeat Started").ConfigureAwait(false);
                 while (!cancelToken.IsCancellationRequested)
                 {
-                    await Task.Delay(intervalMillis, cancelToken).ConfigureAwait(false);
-
                     if (_heartbeatTime != 0) //Server never responded to our last heartbeat
                     {
                         if (ConnectionState == ConnectionState.Connected && (_guildDownloadTask?.IsCompleted ?? false))
@@ -1250,9 +1248,11 @@ namespace Discord
                             return;
                         }
                     }
-                    else
-                        _heartbeatTime = Environment.TickCount;
+
                     await ApiClient.SendHeartbeatAsync(_lastSeq).ConfigureAwait(false);
+                    _heartbeatTime = Environment.TickCount;
+
+                    await Task.Delay(intervalMillis, cancelToken).ConfigureAwait(false);
                 }
                 await logger.DebugAsync("Heartbeat Stopped").ConfigureAwait(false);
             }