From 6173e6227f4af0ce43baab074070a2d5df2c8a98 Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fischer@muhq.space>
Date: Fri, 30 Jun 2023 18:06:08 +0200
Subject: remember the current song before waiting for mpv

---
 player.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'player.go')

diff --git a/player.go b/player.go
index 9ccd13f..0d4da86 100644
--- a/player.go
+++ b/player.go
@@ -89,6 +89,10 @@ func (player *Player) startMpv(uri string) *exec.Cmd {
 }
 
 func (player *Player) runMpv() {
+	// Remember the song we are playing
+	// TODO: This is potentially racy
+	currentSong := wrms.CurrentSong.Load()
+
 	mpv := player.mpv.Load()
 	output, err := mpv.CombinedOutput()
 	if err != nil {
@@ -99,7 +103,6 @@ func (player *Player) runMpv() {
 		}
 	}
 
-	currentSong := wrms.CurrentSong.Load()
 	player.mpv.Store(nil)
 	player.Backends[currentSong.Source].OnSongFinished(currentSong)
 
-- 
cgit v1.2.3