Fixed #174: Fixed deadlock during track skip/finish

matthieugrieger · Aug 22, 2016 · 9222608 · 9222608
1 parent 466e918
commit 9222608
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 MumbleDJ Changelog
 ==================
 
+### August 21, 2016 -- `v3.1.3`
+* Fixed a deadlock that would occur during the transition from the first to second track in a queue.
+
 ### August 14, 2016 -- `v3.1.2`
 * Fixed an index out of range crash in the queue skipping function.
 

diff --git a/bot/queue.go b/bot/queue.go
@@ -199,7 +199,7 @@ func (q *Queue) Skip() {
 
 	q.mutex.Lock()
 	// If caching is disabled, delete the track from disk.
-	if q.Length() != 0 && !viper.GetBool("cache.enabled") {
+	if len(q.Queue) != 0 && !viper.GetBool("cache.enabled") {
 		DJ.YouTubeDL.Delete(q.Queue[0])
 	}
 

diff --git a/main.go b/main.go
@@ -32,7 +32,7 @@ func init() {
 	services.DJ = DJ
 	bot.DJ = DJ
 
-	DJ.Version = "v3.1.2"
+	DJ.Version = "v3.1.3"
 
 	logrus.SetLevel(logrus.WarnLevel)
 }