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

Fix https://github.com/matthieugrieger/mumbledj/issues/11: Crash on skip when no song is playing

Browse source
This commit is contained in:
Matthieu Grieger 2015-01-07 11:06:58 -08:00
parent 73d5050f9d
commit 9667157d63
2 changed files with 40 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -1,6 +1,9 @@
MumbleDJ Changelog MumbleDJ Changelog
================== ==================
### January 7, 2015 -- `v2.2.3`
* Fixed a crash caused by entering a skip request when no song is currently playing.
### January 5, 2015 -- `v2.2.1, v2.2.2` ### January 5, 2015 -- `v2.2.1, v2.2.2`
* Attached `gumbleutil.AutoBitrate` EventListener to client. This should hopefully fix the issues with audio cutting in and out. * Attached `gumbleutil.AutoBitrate` EventListener to client. This should hopefully fix the issues with audio cutting in and out.
* Moved dependency installation to default `make` command to better enforce new updates. * Moved dependency installation to default `make` command to better enforce new updates.

4
commands.go
View file

@ -179,6 +179,7 @@ func add(user *gumble.User, username, url string) {
// Performs skip functionality. Adds a skip to the skippers slice for the current song, and then // Performs skip functionality. Adds a skip to the skippers slice for the current song, and then
// evaluates if a skip should be performed. Both skip and forceskip are implemented here. // evaluates if a skip should be performed. Both skip and forceskip are implemented here.
func skip(user *gumble.User, username string, admin, playlistSkip bool) { func skip(user *gumble.User, username string, admin, playlistSkip bool) {
if dj.audioStream.IsPlaying() {
if playlistSkip { if playlistSkip {
if dj.queue.CurrentItem().ItemType() == "playlist" { if dj.queue.CurrentItem().ItemType() == "playlist" {
if err := dj.queue.CurrentItem().AddSkip(username); err == nil { if err := dj.queue.CurrentItem().AddSkip(username); err == nil {
@ -223,6 +224,9 @@ func skip(user *gumble.User, username string, admin, playlistSkip bool) {
panic(errors.New("An error occurred while adding a skip to the current song.")) panic(errors.New("An error occurred while adding a skip to the current song."))
} }
} }
} else {
user.Send(NO_MUSIC_PLAYING_MSG)
}
} }
// Performs volume functionality. Checks input value against LowestVolume and HighestVolume from // Performs volume functionality. Checks input value against LowestVolume and HighestVolume from