From beb2acb40ca51d680e5d3442b61d6c1e088add16 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Fri, 30 Dec 2016 16:17:38 -0400
Subject: [PATCH] Fixed deadlock during connection

---
 src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
index c9da2226a..428171212 100644
--- a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
+++ b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
@@ -479,6 +479,7 @@ namespace Discord.WebSocket
             if (AudioClient != null)
                 await AudioClient.DisconnectAsync().ConfigureAwait(false);
             AudioClient = null;
+            await Discord.ApiClient.SendVoiceStateUpdateAsync(Id, null, false, false).ConfigureAwait(false);
         }
         internal async Task FinishConnectAudio(int id, string url, string token)
         {
@@ -490,17 +491,23 @@ namespace Discord.WebSocket
                 if (AudioClient == null)
                 {
                     var audioClient = new AudioClient(this, id);
+                    var promise = _audioConnectPromise;
                     audioClient.Disconnected += async ex =>
                     {
                         //If the initial connection hasn't been made yet, reconnecting will lead to deadlocks
-                        if (!_audioConnectPromise.Task.IsCompleted)
+                        if (!promise.Task.IsCompleted)
                         {
                             try { audioClient.Dispose(); } catch { }
                             AudioClient = null;
+                            if (ex != null)
+                                await promise.TrySetExceptionAsync(ex);
+                            else
+                                await promise.TrySetCanceledAsync();
                             return;
                         }
 
-                        await _audioLock.WaitAsync().ConfigureAwait(false);
+                        //TODO: Implement reconnect
+                        /*await _audioLock.WaitAsync().ConfigureAwait(false);
                         try
                         {
                             if (AudioClient == audioClient) //Only reconnect if we're still assigned as this guild's audio client
@@ -527,7 +534,7 @@ namespace Discord.WebSocket
                         finally
                         {
                             _audioLock.Release();
-                        }
+                        }*/
                     };
                     AudioClient = audioClient;
                 }