Fixed crash on disconnect if multiserver is enabled

2016-01-09 20:00:48 -04:00
parent 3d2106cff3
commit 993316bdfd
1 changed files with 11 additions and 4 deletions
--- a/src/Discord.Net.Audio/AudioService.cs
+++ b/src/Discord.Net.Audio/AudioService.cs
@@ -47,10 +47,17 @@ namespace Discord.Audio

 			client.Disconnected += async (s, e) =>
 			{
-				if (Config.EnableMultiserver)
-				{
-					var tasks = _voiceClients
-						.Select(x => x.Value.Disconnect())
+                if (Config.EnableMultiserver)
+                {
+                    var tasks = _voiceClients
+                        .Select(x =>
+                        {
+                            var val = x.Value;
+                            if (val != null)
+                                return x.Value.Disconnect();
+                            else
+                                return TaskHelper.CompletedTask;
+                        })
 						.ToArray();
 					await Task.WhenAll(tasks).ConfigureAwait(false);
 					_voiceClients.Clear();