Merge branch 'dev' into b2

This commit is contained in:
Kwoth 2016-12-21 13:39:38 +01:00
commit 3646202d7e

View File

@ -103,8 +103,6 @@ namespace NadekoBot.Modules.Music.Classes
SongBuffer inStream = new SongBuffer(MusicPlayer, filename, SongInfo, skipTo, frameBytes * 100); SongBuffer inStream = new SongBuffer(MusicPlayer, filename, SongInfo, skipTo, frameBytes * 100);
var bufferTask = inStream.BufferSong(cancelToken).ConfigureAwait(false); var bufferTask = inStream.BufferSong(cancelToken).ConfigureAwait(false);
bytesSent = 0;
try try
{ {
var attempt = 0; var attempt = 0;