mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

possible deadlock fix

Browse Source
This commit is contained in:
Master Kwoth
2016-01-31 20:24:06 +01:00
parent e869972127
commit e1d053abb1
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
NadekoBot/Classes/Music/MusicControls.cs
View File

@@ -26,16 +26,13 @@ namespace NadekoBot.Classes.Music {
public MusicControls() { public MusicControls() {
Task.Run(async () => { Task.Run(async () => {
while (!Stopped) { while (!Stopped) {
lock (_voiceLock) { if (CurrentSong == null) {
if (CurrentSong == null) { if (SongQueue.Count > 0)
if (SongQueue.Count > 0) await LoadNextSong();
LoadNextSong().Wait();
} else if (CurrentSong.State == StreamState.Completed || NextSong) {
NextSong = false;
LoadNextSong().Wait();
}
} else if (CurrentSong.State == StreamState.Completed || NextSong) {
NextSong = false;
await LoadNextSong();
} }
await Task.Delay(1000); await Task.Delay(1000);
} }
@@ -71,18 +68,16 @@ namespace NadekoBot.Classes.Music {
} }
internal void Stop() { internal void Stop() {
lock (_voiceLock) { Stopped = true;
Stopped = true; foreach (var kvp in SongQueue) {
foreach (var kvp in SongQueue) { if (kvp != null)
if (kvp != null) kvp.Stop();
kvp.Stop();
}
SongQueue.Clear();
CurrentSong?.Stop();
CurrentSong = null;
VoiceClient?.Disconnect();
VoiceClient = null;
} }
SongQueue.Clear();
CurrentSong?.Stop();
CurrentSong = null;
VoiceClient?.Disconnect();
VoiceClient = null;
} }
internal bool TogglePause() => IsPaused = !IsPaused; internal bool TogglePause() => IsPaused = !IsPaused;