From 701720a0f802c20d283c197aa7ea9a74f628c0cb Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Fri, 6 May 2016 13:30:44 -0400
Subject: Add a TimeoutError if VoiceClient.connect fails.

---
 discord/client.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'discord/client.py')

diff --git a/discord/client.py b/discord/client.py
index 3d7b8afa..f56f84bf 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -2450,7 +2450,16 @@ class Client:
         }
 
         voice = VoiceClient(**kwargs)
-        yield from voice.connect()
+        try:
+            yield from voice.connect()
+        except asyncio.TimeoutError as e:
+            try:
+                yield from voice.disconnect()
+            except:
+                # we don't care if disconnect failed because connection failed
+                pass
+            raise e # re-raise
+
         self.connection._add_voice_client(server.id, voice)
         return voice
 
-- 
cgit v1.2.3