From 0d281bc5bf8cecb1eb1f26d0b2063771b33e73a4 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Fri, 6 Sep 2024 18:06:11 -0700 Subject: [PATCH] switch to atomic.Bool --- ui/widgets/tracklistloader.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ui/widgets/tracklistloader.go b/ui/widgets/tracklistloader.go index 2e95cc9..f3348bd 100644 --- a/ui/widgets/tracklistloader.go +++ b/ui/widgets/tracklistloader.go @@ -1,13 +1,15 @@ package widgets import ( + "sync/atomic" + "github.com/dweymouth/supersonic/backend/mediaprovider" ) // Component that manages lazily loading more tracks into a Tracklist // as the user scrolls near the bottom. type TracklistLoader struct { - disposed bool + disposed atomic.Bool tracklist *Tracklist iter mediaprovider.TrackIterator @@ -32,7 +34,7 @@ func NewTracklistLoader(tracklist *Tracklist, iter mediaprovider.TrackIterator) // Cancels all asynchronous loads so that they will no longer modify the tracklist. func (t *TracklistLoader) Dispose() { - t.disposed = true + t.disposed.Store(true) t.tracklist.OnTrackShown = nil } @@ -40,7 +42,7 @@ func (t *TracklistLoader) onTrackShown(tracknum int) { if tracknum > t.highestShown { t.highestShown = tracknum } - if t.highestShown >= t.len-25 && !t.fetching && !t.done && !t.disposed { + if t.highestShown >= t.len-25 && !t.fetching && !t.done && !t.disposed.Load() { t.fetching = true go t.loadMoreTracks(25) } @@ -60,11 +62,11 @@ func (t *TracklistLoader) loadMoreTracks(num int) { break } t.trackBuffer = append(t.trackBuffer, tr) - if t.disposed { + if t.disposed.Load() { break } } - if t.disposed { + if t.disposed.Load() { return } t.tracklist.AppendTracks(t.trackBuffer)