X-Git-Url: https://code.octet-stream.net/broadcaster/blobdiff_plain/abff2fe6f304da8f632c88d6d66c3304ecb6a7b5..0826fb215c2e617e2547a1e0de591fc6540d18ba:/radio/main.go

diff --git a/radio/main.go b/radio/main.go
index 85d15b1..13824b0 100644
--- a/radio/main.go
+++ b/radio/main.go
@@ -20,7 +20,7 @@ import (
 	"golang.org/x/net/websocket"
 )
 
-const version = "v1.1.0"
+const version = "v1.2.0"
 const sampleRate = 44100
 
 var config RadioConfig = NewRadioConfig()
@@ -330,16 +330,20 @@ entries:
 			})))
 		}
 
+		aborting := false
 		select {
 		case <-done:
 			log.Println("Audio playback complete")
 		case <-cancel:
-			log.Println("Disengaging PTT and aborting playlist playback")
-			ptt.DisengagePTT()
-			break entries
+			log.Println("Playlist aborting as requested")
+			aborting = true
 		}
-		log.Println("PTT off since audio file has finished")
+		speaker.Clear()
+		log.Println("PTT off")
 		ptt.DisengagePTT()
+		if aborting {
+			break entries
+		}
 	}
 	log.Println("Playlist finished", playlist.Name)
 	statusCollector.PlaylistBeginIdle <- true