From 1ed561c17844537c6429b0e5c11f3f9d3cfe7e47 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Wed, 19 Jun 2024 07:45:39 -0700 Subject: [PATCH] don't crash if server returns nil saved play queue but no error --- backend/mediaprovider/subsonic/subsonicmediaprovider.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backend/mediaprovider/subsonic/subsonicmediaprovider.go b/backend/mediaprovider/subsonic/subsonicmediaprovider.go index 32919ab..6d66c49 100644 --- a/backend/mediaprovider/subsonic/subsonicmediaprovider.go +++ b/backend/mediaprovider/subsonic/subsonicmediaprovider.go @@ -411,7 +411,11 @@ func (s *subsonicMediaProvider) GetPlayQueue() (*mediaprovider.SavedPlayQueue, e if err != nil { return nil, err } + savedQueue := &mediaprovider.SavedPlayQueue{} + if pq == nil { + return savedQueue, nil + } savedQueue.Tracks = sharedutil.MapSlice(pq.Entries, toTrack) savedQueue.TrackPos = slices.IndexFunc(pq.Entries, func(e *subsonic.Child) bool { return e.ID == pq.Current