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

Fixing build issues

Browse source
This commit is contained in:
MichaelOultram 2015-07-28 13:12:49 +01:00
parent b4867c629d
commit 09637395cc
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
songqueue.go
View file

@ -42,14 +42,14 @@ func (q *SongQueue) CurrentSong() Song {
// NextSong moves to the next Song in SongQueue. NextSong() removes the first Song in the queue. // NextSong moves to the next Song in SongQueue. NextSong() removes the first Song in the queue.
func (q *SongQueue) NextSong() { func (q *SongQueue) NextSong() {
if q.CurrentSong().Playlist() != nil { if s, err := q.PeekNext(); err == nil {
if s, err := q.PeekNext(); err == nil { if q.CurrentSong().Playlist() != nil && s.Playlist() != nil {
if s.Playlist() != nil && (q.CurrentSong().Playlist().ID() != s.Playlist().ID()) { if q.CurrentSong().Playlist().ID() != s.Playlist().ID() {
q.CurrentSong().Playlist().DeleteSkippers() q.CurrentSong().Playlist().DeleteSkippers()
} }
} else {
q.CurrentSong().Playlist().DeleteSkippers()
} }
} else {
q.CurrentSong().Playlist().DeleteSkippers()
} }
q.queue = q.queue[1:] q.queue = q.queue[1:]
} }