github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed deadlock during connection

Browse Source
This commit is contained in:
RogueException
2016-12-30 16:17:38 -04:00
parent 3b72d48950
commit beb2acb40c
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
View File

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