Browse Source

Fixed AudioClient Disconnect Deadlock

pull/1199/head
ComputerMaster1st 7 years ago
parent
commit
87cbc8440a
1 changed files with 3 additions and 5 deletions
  1. +3
    -5
      src/Discord.Net.WebSocket/ConnectionManager.cs

+ 3
- 5
src/Discord.Net.WebSocket/ConnectionManager.cs View File

@@ -106,9 +106,7 @@ namespace Discord
public virtual async Task StopAsync() public virtual async Task StopAsync()
{ {
Cancel(); Cancel();
var task = _task;
if (task != null)
await task.ConfigureAwait(false);
await Task.CompletedTask;
} }


private async Task ConnectAsync(CancellationTokenSource reconnectCancelToken) private async Task ConnectAsync(CancellationTokenSource reconnectCancelToken)
@@ -159,9 +157,9 @@ namespace Discord


await _onDisconnecting(ex).ConfigureAwait(false); await _onDisconnecting(ex).ConfigureAwait(false);


await _logger.InfoAsync("Disconnected").ConfigureAwait(false);
State = ConnectionState.Disconnected;
await _disconnectedEvent.InvokeAsync(ex, isReconnecting).ConfigureAwait(false); await _disconnectedEvent.InvokeAsync(ex, isReconnecting).ConfigureAwait(false);
State = ConnectionState.Disconnected;
await _logger.InfoAsync("Disconnected").ConfigureAwait(false);
} }


public async Task CompleteAsync() public async Task CompleteAsync()


Loading…
Cancel
Save