From d84eeb99c1b5c4e14416ad6afd2ab917b35626fe Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Sun, 5 Nov 2023 08:36:18 -0800 Subject: [PATCH] Fix #270: crash when removing from currently playing to end of play queue --- backend/playbackmanager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/playbackmanager.go b/backend/playbackmanager.go index c616c83..44857f0 100644 --- a/backend/playbackmanager.go +++ b/backend/playbackmanager.go @@ -121,7 +121,7 @@ func (p *PlaybackManager) DisableCallbacks() { // Gets the curently playing song, if any. func (p *PlaybackManager) NowPlaying() *mediaprovider.Track { - if len(p.playQueue) == 0 || p.player.GetStatus().State == player.Stopped { + if p.nowPlayingIdx < 0 || len(p.playQueue) == 0 || p.player.GetStatus().State == player.Stopped { return nil } return p.playQueue[p.nowPlayingIdx]