CodeMirror/Bonfire
1
0
Fork 0
mirror of synced 2024-05-19 20:12:30 +12:00
Code Issues Releases Wiki Activity

Add a second check to ensure we are not playing before actually overwriting the song/dj

Browse source
This commit is contained in:
phxntxm 2017-06-07 03:53:15 -05:00
parent 6779dfca03
commit 898fd8b7f4
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cogs/music.py
View file

@ -104,20 +104,28 @@ class VoiceState:
async def next_song(self):
if not self.user_queue:
self.current = await self.songs.get_next_entry()
song = await self.songs.get_next_entry()
else:
try:
self.dj = self.djs.popleft()
dj = self.djs.popleft()
except IndexError:
self.current = None
song = None
else:
self.current = await self.dj.get_next_entry()
song = await self.dj.get_next_entry()
self.djs.rotate(-1)
if self.current is None:
self.djs.remove(self.dj)
if song is None:
self.djs.remove(dj)
await self.next_song()
else:
self.current.requester = self.dj.member
self.current.requester = dj.member
# Add an extra check here in case in the very short period of time possible, someone has queued a
# song while we are downloading the next
if not self.playing:
self.dj = dj
if not self.playing:
self.current = song
class Music: