Retain player state & shuffle play breaks picking a song from the list

Issue description:

If retain player state is on, and shuffle play is enabled, clicking on a specific song in the songs tab plays a random song from the playlist instead of playing that specific song, and then shuffling from there.


Upload description: PartyWumpus

Additional information:

This does not happen in playlists as far as I can tell, which is strange. Does still occur with filters in the song tab though.

Reproduction steps:

Go to settings, playback, playback and enable “Retain player state”.

Enable shuffle play.

Go to the songs tab.

Try starting any song, it will jump to a different song in the list.

Media provider: