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

Added isDisposed checks to audio classes. Dont flush the OpusEncodeStream

Browse Source
This commit is contained in:
RogueException
2016-12-30 18:21:00 -04:00
parent 9cca612468
commit 64ddcb564b
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Discord.Net.WebSocket/Audio/AudioClient.cs
View File

@@ -43,9 +43,9 @@ namespace Discord.Audio
private Task _heartbeatTask;
private long _heartbeatTime;
private string _url;
private bool _isDisposed;
private uint _ssrc;
private byte[] _secretKey;
private bool _isDisposed;
public SocketGuild Guild { get; }
public DiscordVoiceAPIClient ApiClient { get; private set; }
@@ -165,8 +165,9 @@ namespace Discord.Audio
ConnectionState = ConnectionState.Disconnected;
await _audioLogger.InfoAsync("Disconnected").ConfigureAwait(false);
await _disconnectedEvent.InvokeAsync(ex).ConfigureAwait(false);
await Discord.ApiClient.SendVoiceStateUpdateAsync(Guild.Id, null, false, false).ConfigureAwait(false);
}
public Stream CreateOpusStream(int samplesPerFrame)
@@ -314,10 +315,12 @@ namespace Discord.Audio
internal void Dispose(bool disposing)
{
DisconnectInternalAsync(null).GetAwaiter().GetResult();
if (!_isDisposed)
if (disposing && !_isDisposed)
{
_isDisposed = true;
ApiClient.Dispose();
DisconnectInternalAsync(null).GetAwaiter().GetResult();
ApiClient.Dispose();
}
}
/// <inheritdoc />
public void Dispose() => Dispose(true);