owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #141: don't crash when switching artist page view if invalid artist or page not loaded

Browse Source
This commit is contained in:
Drew Weymouth
2023-04-23 10:37:43 -07:00
parent f8127d7e00
commit 410538699c
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/browsing/artistpage.go
+10
View File
@@ -167,6 +167,11 @@ func (a *ArtistPage) load() {
func (a *ArtistPage) showAlbumGrid() { func (a *ArtistPage) showAlbumGrid() {
if a.albumGrid == nil { if a.albumGrid == nil {
if a.artistInfo == nil {
// page not loaded yet or invalid artist
a.activeView = 0 // if page still loading, will show discography view first
return
}
a.albumGrid = widgets.NewFixedAlbumGrid(a.artistInfo.Album, a.im, true /*showYear*/) a.albumGrid = widgets.NewFixedAlbumGrid(a.artistInfo.Album, a.im, true /*showYear*/)
a.albumGrid.OnPlayAlbum = a.onPlayAlbum a.albumGrid.OnPlayAlbum = a.onPlayAlbum
a.albumGrid.OnShowAlbumPage = a.onShowAlbumPage a.albumGrid.OnShowAlbumPage = a.onShowAlbumPage
@@ -177,6 +182,11 @@ func (a *ArtistPage) showAlbumGrid() {
func (a *ArtistPage) showTopTracks() { func (a *ArtistPage) showTopTracks() {
if a.tracklistCtr == nil { if a.tracklistCtr == nil {
if a.artistInfo == nil {
// page not loaded yet or invalid artist
a.activeView = 1 // if page still loading, will show tracks view first
return
}
ts, err := a.sm.Server.GetTopSongs(a.artistInfo.Name, map[string]string{"count": "20"}) ts, err := a.sm.Server.GetTopSongs(a.artistInfo.Name, map[string]string{"count": "20"})
if err != nil { if err != nil {
log.Printf("error getting top songs: %s", err.Error()) log.Printf("error getting top songs: %s", err.Error())