From 1a4237e493a3c9546d82eb6f0539eae8f9ea0622 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Tue, 18 Mar 2025 08:39:38 -0700 Subject: [PATCH] Fix #580: ensure track search results are added properly --- ui/widgets/tracklist.go | 2 +- ui/widgets/tracklistloader.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/widgets/tracklist.go b/ui/widgets/tracklist.go index d06f279..b5277ff 100644 --- a/ui/widgets/tracklist.go +++ b/ui/widgets/tracklist.go @@ -342,7 +342,7 @@ func (t *Tracklist) GetTracks() []*mediaprovider.Track { // Append more tracks to the tracklist. func (t *Tracklist) AppendTracks(trs []*mediaprovider.Track) { - t.tracksOrigOrder = append(t.tracks, util.ToTrackListModels(trs)...) + t.tracksOrigOrder = append(t.tracksOrigOrder, util.ToTrackListModels(trs)...) t.doSortTracks() t.list.Refresh() } diff --git a/ui/widgets/tracklistloader.go b/ui/widgets/tracklistloader.go index 461c829..cc1a235 100644 --- a/ui/widgets/tracklistloader.go +++ b/ui/widgets/tracklistloader.go @@ -72,7 +72,7 @@ func (t *TracklistLoader) loadMoreTracks(num int) { if t.disposed.Load() { return } - fyne.Do(func() { + fyne.DoAndWait(func() { t.tracklist.SetLoading(false) t.tracklist.AppendTracks(t.trackBuffer) t.len += len(t.trackBuffer)