From 275c9953a06337c3b004e3961c7ad4e16c3ba196 Mon Sep 17 00:00:00 2001 From: Programmix Date: Sat, 25 Feb 2017 15:17:39 -0800 Subject: [PATCH] Fixes disconnecting VoiceConnections before connected (#1227) --- src/client/voice/VoiceConnection.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/client/voice/VoiceConnection.js b/src/client/voice/VoiceConnection.js index e89eaf3d6..fd2eb864a 100644 --- a/src/client/voice/VoiceConnection.js +++ b/src/client/voice/VoiceConnection.js @@ -311,11 +311,18 @@ class VoiceConnection extends EventEmitter { */ cleanup() { const { ws, udp } = this.sockets; - ws.removeAllListeners('error'); - udp.removeAllListeners('error'); - ws.removeAllListeners('ready'); - ws.removeAllListeners('sessionDescription'); - ws.removeAllListeners('speaking'); + + if (ws) { + ws.removeAllListeners('error'); + ws.removeAllListeners('ready'); + ws.removeAllListeners('sessionDescription'); + ws.removeAllListeners('speaking'); + } + + if (udp) { + udp.removeAllListeners('error'); + } + this.sockets.ws = null; this.sockets.udp = null; }