containers/mumbledj
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #92 from GabrielPlassard/fixIndexOutOfRange

Browse source 
Fix possible index out of range when auto shuffle is on
This commit is contained in:
Matthieu Grieger 2015-10-14 18:26:05 -07:00
parent 5d56a368f8 3ac7077263
commit 5fcf31f094
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
songqueue.go
View file

@ -124,10 +124,12 @@ func (q *SongQueue) ShuffleSongs() {
// Sets a random song as next song to be played // Sets a random song as next song to be played
// queueWasEmpty wether the queue was empty before adding the last song // queueWasEmpty wether the queue was empty before adding the last song
func (q *SongQueue) RandomNextSong(queueWasEmpty bool){ func (q *SongQueue) RandomNextSong(queueWasEmpty bool){
if (q.Len() > 1){
nextSongIndex := 1 nextSongIndex := 1
if queueWasEmpty{ if queueWasEmpty{
nextSongIndex = 0 nextSongIndex = 0
} }
swapIndex := nextSongIndex + rand.Intn(q.Len()) swapIndex := nextSongIndex + rand.Intn(q.Len() - 1)
q.queue[nextSongIndex], q.queue[swapIndex] = q.queue[swapIndex], q.queue[nextSongIndex] q.queue[nextSongIndex], q.queue[swapIndex] = q.queue[swapIndex], q.queue[nextSongIndex]
}
} }