From ab2ac363b0153dbd99dbc2f5c99ab8c7479e19b2 Mon Sep 17 00:00:00 2001 From: Michael Manganiello Date: Mon, 11 Mar 2024 23:59:53 -0300 Subject: [PATCH] fix: Disable genre filter only on Genre page --- ui/browsing/albumspage.go | 9 +-------- ui/browsing/genrepage.go | 3 ++- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/ui/browsing/albumspage.go b/ui/browsing/albumspage.go index 8fafe68..c5f2252 100644 --- a/ui/browsing/albumspage.go +++ b/ui/browsing/albumspage.go @@ -40,14 +40,7 @@ func (a *albumsPageAdapter) Filter() mediaprovider.AlbumFilter { func (a *albumsPageAdapter) FilterButton() widgets.FilterButton[mediaprovider.Album, mediaprovider.AlbumFilterOptions] { if a.filterBtn == nil { - disableGenres := len(a.Filter().Options().Genres) > 0 - genreFn := a.mp.GetGenres - if disableGenres { - // genre filter is disabled for this page, so no need to actually call genre list fetching function - genreFn = func() ([]*mediaprovider.Genre, error) { return nil, nil } - } - a.filterBtn = widgets.NewAlbumFilterButton(a.Filter(), genreFn) - a.filterBtn.GenreDisabled = disableGenres + a.filterBtn = widgets.NewAlbumFilterButton(a.Filter(), a.mp.GetGenres) } return a.filterBtn } diff --git a/ui/browsing/genrepage.go b/ui/browsing/genrepage.go index e330fed..279d1e2 100644 --- a/ui/browsing/genrepage.go +++ b/ui/browsing/genrepage.go @@ -41,7 +41,8 @@ func (g *genrePageAdapter) Filter() mediaprovider.AlbumFilter { func (g *genrePageAdapter) FilterButton() widgets.FilterButton[mediaprovider.Album, mediaprovider.AlbumFilterOptions] { if g.filterBtn == nil { - g.filterBtn = widgets.NewAlbumFilterButton(g.Filter(), g.mp.GetGenres) + g.filterBtn = widgets.NewAlbumFilterButton(g.Filter(), func() ([]*mediaprovider.Genre, error) { return nil, nil }) + g.filterBtn.GenreDisabled = true } return g.filterBtn }