From 2e8f67e8a41858af2638412cd0ff5dd48cac6390 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Tue, 21 Jun 2016 05:32:26 -0300
Subject: [PATCH] Merged WaitForGuildsAsync into ConnectAsync

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

diff --git a/src/Discord.Net/DiscordSocketClient.cs b/src/Discord.Net/DiscordSocketClient.cs
index 77e5c37e7..d21687212 100644
--- a/src/Discord.Net/DiscordSocketClient.cs
+++ b/src/Discord.Net/DiscordSocketClient.cs
@@ -141,7 +141,7 @@ namespace Discord
         }
 
         /// <inheritdoc />
-        public async Task ConnectAsync()
+        public async Task ConnectAsync(bool waitForGuilds = true)
         {
             await _connectionLock.WaitAsync().ConfigureAwait(false);
             try
@@ -150,6 +150,13 @@ namespace Discord
                 await ConnectInternalAsync().ConfigureAwait(false);
             }
             finally { _connectionLock.Release(); }
+
+            if (waitForGuilds)
+            {
+                var downloadTask = _guildDownloadTask;
+                if (downloadTask != null)
+                    await _guildDownloadTask.ConfigureAwait(false);
+            }
         }
         private async Task ConnectInternalAsync()
         {
@@ -1157,11 +1164,5 @@ namespace Discord
             while ((_unavailableGuilds != 0) && (Environment.TickCount - _lastGuildAvailableTime < 2000))
                 await Task.Delay(500, cancelToken).ConfigureAwait(false);
         }
-        public async Task WaitForGuildsAsync()
-        {
-            var downloadTask = _guildDownloadTask;
-            if (downloadTask != null)
-                await _guildDownloadTask.ConfigureAwait(false);
-        }
     }
 }