Fixed .play when queue is stopped. .play X will now also unstop the player
This commit is contained in:
parent
8f90410e2d
commit
0e4728d9c9
@ -28,6 +28,7 @@ namespace NadekoBot.Modules.Administration
|
|||||||
_muteService = muteService;
|
_muteService = muteService;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//todo move to service
|
||||||
private async Task<PunishmentAction?> InternalWarn(IGuild guild, ulong userId, string modName, string reason)
|
private async Task<PunishmentAction?> InternalWarn(IGuild guild, ulong userId, string modName, string reason)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(reason))
|
if (string.IsNullOrWhiteSpace(reason))
|
||||||
|
@ -339,18 +339,6 @@ namespace NadekoBot.Services.Music
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetIndex(int index)
|
|
||||||
{
|
|
||||||
if (index < 0)
|
|
||||||
throw new ArgumentOutOfRangeException(nameof(index));
|
|
||||||
lock (locker)
|
|
||||||
{
|
|
||||||
Queue.CurrentIndex = index;
|
|
||||||
manualIndex = true;
|
|
||||||
CancelCurrentSong();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task<IAudioClient> GetAudioClient(bool reconnect = false)
|
private async Task<IAudioClient> GetAudioClient(bool reconnect = false)
|
||||||
{
|
{
|
||||||
if (_audioClient == null ||
|
if (_audioClient == null ||
|
||||||
@ -409,6 +397,21 @@ namespace NadekoBot.Services.Music
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SetIndex(int index)
|
||||||
|
{
|
||||||
|
if (index < 0)
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(index));
|
||||||
|
lock (locker)
|
||||||
|
{
|
||||||
|
if (Exited)
|
||||||
|
return;
|
||||||
|
Queue.CurrentIndex = index;
|
||||||
|
manualIndex = true;
|
||||||
|
Stopped = false;
|
||||||
|
CancelCurrentSong();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void Next(int skipCount = 1)
|
public void Next(int skipCount = 1)
|
||||||
{
|
{
|
||||||
lock (locker)
|
lock (locker)
|
||||||
@ -420,9 +423,11 @@ namespace NadekoBot.Services.Music
|
|||||||
// It's a bit weird, but that's the least annoying solution
|
// It's a bit weird, but that's the least annoying solution
|
||||||
if (!Stopped)
|
if (!Stopped)
|
||||||
Queue.Next(skipCount - 1);
|
Queue.Next(skipCount - 1);
|
||||||
|
else
|
||||||
|
Queue.CurrentIndex = 0;
|
||||||
Stopped = false;
|
Stopped = false;
|
||||||
Unpause();
|
|
||||||
CancelCurrentSong();
|
CancelCurrentSong();
|
||||||
|
Unpause();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user