From 64d09f3720f82318fede112e8ae8c034e842da41 Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Sat, 13 May 2017 16:01:32 -0400
Subject: [PATCH] Force disconnect in abc.Connectable.connect.

Some cases of is_connected is not set so we need to force it to clear
it anyway.
---
 discord/abc.py          |  2 +-
 discord/voice_client.py | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/discord/abc.py b/discord/abc.py
index 6f774f9bc..d9fb03f4b 100644
--- a/discord/abc.py
+++ b/discord/abc.py
@@ -940,7 +940,7 @@ class Connectable(metaclass=abc.ABCMeta):
             yield from voice.connect(reconnect=reconnect)
         except asyncio.TimeoutError as e:
             try:
-                yield from voice.disconnect()
+                yield from voice.disconnect(force=True)
             except:
                 # we don't care if disconnect failed because connection failed
                 pass
diff --git a/discord/voice_client.py b/discord/voice_client.py
index 67fd2efaa..40122c985 100644
--- a/discord/voice_client.py
+++ b/discord/voice_client.py
@@ -81,7 +81,7 @@ class VoiceClient:
         The voice connection token.
     endpoint: str
         The endpoint we are connecting to.
-    channel: :class:`Channel`
+    channel: :class:`abc.Connectable`
         The voice channel connected to.
     loop
         The event loop that the voice client is running on.
@@ -152,11 +152,13 @@ class VoiceClient:
 
     @asyncio.coroutine
     def terminate_handshake(self, *, remove=False):
-        guild_id, _ = self.channel._get_voice_state_pair()
+        guild_id, channel_id = self.channel._get_voice_state_pair()
         self._handshake_complete.clear()
         yield from self.main_ws.voice_state(guild_id, None, self_mute=True)
 
+        log.info('The voice handshake is being terminated for Channel ID %s (Guild ID %s)', channel_id, guild_id)
         if remove:
+            log.info('The voice client has been removed for Channel ID %s (Guild ID %s)', channel_id, guild_id)
             key_id, _ = self.channel._get_voice_client_key()
             self._state._remove_voice_client(key_id)
 
@@ -247,19 +249,21 @@ class VoiceClient:
                 yield from self.connect(reconnect=True)
 
     @asyncio.coroutine
-    def disconnect(self):
+    def disconnect(self, *, force=False):
         """|coro|
 
         Disconnects all connections to the voice client.
         """
-        if not self._connected.is_set():
+        if not force and not self._connected.is_set():
             return
 
         self.stop()
         self._connected.clear()
 
         try:
-            yield from self.ws.close()
+            if self.ws:
+                yield from self.ws.close()
+
             yield from self.terminate_handshake(remove=True)
         finally:
             if self.socket: