From 519fe33175a5c4131d61362377383e44da021bf2 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Tue, 28 Nov 2023 17:44:31 +0000 Subject: [PATCH] Fix ab1a4c6c: Changing baseset/playlist while shuffle is on does not change song. (#11510) The change-playlist function relied on toggling shuffle to restart playing which is no longer the case, so always handle it when changing playlist instead. --- src/music_gui.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 490d80817e..335b9dd617 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -156,12 +156,8 @@ void MusicSystem::ChangePlaylist(PlaylistChoices pl) this->selected_playlist = pl; this->playlist_position = 0; - if (_settings_client.music.shuffle) { - this->Shuffle(); - /* Shuffle() will also Play() if necessary, only start once */ - } else if (_settings_client.music.playing) { - this->Play(); - } + if (_settings_client.music.shuffle) this->Shuffle(); + if (_settings_client.music.playing) this->Play(); } InvalidateWindowData(WC_MUSIC_TRACK_SELECTION, 0);