From 38ea40f403812dd3aa8164ea2e8ecdef2587d537 Mon Sep 17 00:00:00 2001 From: cookkkie Date: Mon, 13 Mar 2017 01:24:27 +0100 Subject: [PATCH] Add rollback strategy to Client.join_voice_channel --- discord/client.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/discord/client.py b/discord/client.py index c7c7f08ae..c9b051b19 100644 --- a/discord/client.py +++ b/discord/client.py @@ -3181,8 +3181,13 @@ class Client: # request joining yield from self.ws.voice_state(server.id, channel.id) - session_id_data = yield from asyncio.wait_for(session_id_future, timeout=10.0, loop=self.loop) - data = yield from asyncio.wait_for(voice_data_future, timeout=10.0, loop=self.loop) + + try: + session_id_data = yield from asyncio.wait_for(session_id_future, timeout=10.0, loop=self.loop) + data = yield from asyncio.wait_for(voice_data_future, timeout=10.0, loop=self.loop) + except asyncio.TimeoutError: + yield from self.ws.voice_state(server.id, None, self_mute=True) + return None kwargs = { 'user': self.user,