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

Fix https://github.com/matthieugrieger/mumbledj/issues/154: Crash on !forceskip

Browse source
This commit is contained in:
Matthieu Grieger 2016-06-25 09:03:13 -07:00
parent 0320ca75fa
commit 1731047317
3 changed files with 5 additions and 4 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
================== ==================
### June 25, 2016 -- `v3.0.4`
* Fixed a crash on `!forceskip`.
### June 22, 2016 -- `v3.0.3` ### June 22, 2016 -- `v3.0.3`
* Fixed SoundCloud API startup check (thanks [@alucardRD](https://github.com/alucardRD)). * Fixed SoundCloud API startup check (thanks [@alucardRD](https://github.com/alucardRD)).

4
bot/queue.go
View file

@ -189,9 +189,8 @@ func (q *Queue) RandomNextTrack(queueWasEmpty bool) {
// Skip performs the necessary actions that take place when a track is skipped // Skip performs the necessary actions that take place when a track is skipped
// via a command. // via a command.
func (q *Queue) Skip() { func (q *Queue) Skip() {
// Stop audio stream if one exists. // Set AudioStream to nil if it isn't already.
if DJ.AudioStream != nil { if DJ.AudioStream != nil {
q.StopCurrent()
DJ.AudioStream = nil DJ.AudioStream = nil
} }
@ -346,7 +345,6 @@ func (q *Queue) StopCurrent() error {
return errors.New("The audio stream is nil") return errors.New("The audio stream is nil")
} }
DJ.AudioStream.Stop() DJ.AudioStream.Stop()
DJ.AudioStream = nil
return nil return nil
} }

2
main.go
View file

@ -32,7 +32,7 @@ func init() {
services.DJ = DJ services.DJ = DJ
bot.DJ = DJ bot.DJ = DJ
DJ.Version = "3.0.3" DJ.Version = "v3.0.4"
logrus.SetLevel(logrus.WarnLevel) logrus.SetLevel(logrus.WarnLevel)
} }