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

Fixed LeaveVoiceServer when Multiserver is disabled

Browse Source
This commit is contained in:
RogueException
2015-10-17 00:59:50 -03:00
parent 81428ac0e2
commit dd9b72a05d
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Discord.Net/DiscordClient.cs
View File

@@ -798,10 +798,18 @@ namespace Discord
CheckReady(); //checkVoice is done inside the voice client CheckReady(); //checkVoice is done inside the voice client
if (serverId == null) throw new ArgumentNullException(nameof(serverId)); if (serverId == null) throw new ArgumentNullException(nameof(serverId));
DiscordSimpleClient client; if (Config.EnableVoiceMultiserver)
if (_voiceClients.TryRemove(serverId, out client)) {
await client.Disconnect(); DiscordSimpleClient client;
} if (_voiceClients.TryRemove(serverId, out client))
await client.Disconnect();
}
else
{
_dataSocket.SendLeaveVoice(serverId);
await _voiceSocket.Disconnect();
}
}
private void SendInitialLog() private void SendInitialLog()
{ {

9
src/Discord.Net/DiscordSimpleClient.cs
View File

@@ -248,10 +248,15 @@ namespace Discord
protected virtual async Task Cleanup() protected virtual async Task Cleanup()
{ {
await _dataSocket.Disconnect().ConfigureAwait(false);
if (_enableVoice) if (_enableVoice)
{
string voiceServerId = _voiceSocket.CurrentServerId;
if (voiceServerId != null)
_dataSocket.SendLeaveVoice(voiceServerId);
await _voiceSocket.Disconnect().ConfigureAwait(false); await _voiceSocket.Disconnect().ConfigureAwait(false);
}
await _dataSocket.Disconnect().ConfigureAwait(false);
_currentUserId = null; _currentUserId = null;
_gateway = null; _gateway = null;
_token = null; _token = null;