Check voice connection channelID before disconnecting

abalabahaha · May 26, 2017 · ae77d2c · ae77d2c
1 parent 80b4c78
commit ae77d2c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/Client.js b/lib/Client.js
@@ -252,6 +252,9 @@ class Client extends EventEmitter {
     * @arg {String} channelID The ID of the voice channel
     */
     leaveVoiceChannel(channelID) {
+        if(!channelID) {
+            return;
+        }
         var channel = this.getChannel(channelID);
         if(!channel) {
             return;

diff --git a/lib/gateway/Shard.js b/lib/gateway/Shard.js
@@ -688,7 +688,11 @@ class Shard extends EventEmitter {
             case "GUILD_DELETE": {
                 var voiceConnection = this.client.voiceConnections.get(packet.d.id);
                 if(voiceConnection) {
-                    this.client.leaveVoiceChannel(voiceConnection.channelID);
+                    if(voiceConnection.channelID) {
+                        this.client.leaveVoiceChannel(voiceConnection.channelID);
+                    } else {
+                        this.client.voiceConnections.leave(packet.d.id);
+                    }
                 }
 
                 delete this.client.guildShardMap[packet.d.id];