Resolve issue with artist/song library playback

components/music/MusicAlbumDetails.brs

@@ -18,6 +18,11 @@ sub pageContentChanged()
     setPosterImage(item.posterURL)
     setScreenTitle(item.json)
     setOnScreenTextValues(item.json)
+
+    ' Only 1 song shown, so hide Play Album button
+    if item.json.ChildCount = 1
+        m.top.findNode("playAlbum").visible = false
+    end if
 end sub
 
 ' Set poster image on screen
@@ -57,6 +62,11 @@ end sub
 function onKeyEvent(key as string, press as boolean) as boolean
     if not press then return false
 
+    ' Play Album is hidden, so there are no navigation needs here
+    if m.top.pageContent.json.ChildCount = 1
+        return false
+    end if
+
     if key = "right" and m.playAlbum.hasFocus()
         m.songList.setFocus(true)
         return true

source/ShowScenes.brs

@@ -325,15 +325,15 @@ end function
 function CreateMusicArtistDetailsGroup(musicartist)
     musicData = MusicAlbumList(musicartist.id)
 
-    ' User could have albums or just songs under artists
+    ' User only has songs under artists
     if musicData = invalid or musicData.Items.Count() = 0
         ' Just songs under artists...
         group = CreateObject("roSGNode", "MusicAlbumDetails")
         group.pageContent = ItemMetaData(musicartist.id)
-        group.musicArtistAlbumData = MusicSongList(musicartist.id)
+        group.albumData = MusicSongList(musicartist.id)
         group.observeField("playSong", m.port)
     else
-        ' Albums...
+        ' User has albums under artists
         group = CreateObject("roSGNode", "MusicArtistDetails")
         group.pageContent = ItemMetaData(musicartist.id)
         group.musicArtistAlbumData = musicData