Merge remote-tracking branch 'Kwoth/dev' into dev

This commit is contained in:
Shikhir Arora 2017-02-16 11:51:58 -05:00
commit 99417b5779

View File

@ -130,15 +130,15 @@ namespace NadekoBot.Modules.Music.Classes
{
try
{
if (audioClient != null)
try { await audioClient.DisconnectAsync().ConfigureAwait(false); } catch { }
audioClient = await PlaybackVoiceChannel.ConnectAsync().ConfigureAwait(false);
CurrentSong = GetNextSong();
if (CurrentSong == null)
continue;
if (audioClient != null)
try { await audioClient.DisconnectAsync().ConfigureAwait(false); } catch { }
audioClient = await PlaybackVoiceChannel.ConnectAsync().ConfigureAwait(false);
var index = playlist.IndexOf(CurrentSong);
if (index != -1)
RemoveSongAt(index, true);