diff options
| author | Dave Blake <oak99sky@yahoo.co.uk> | 2020-11-26 10:04:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-26 10:04:17 +0000 |
| commit | f2faea3a8b9930ae8e7870a1e374c40fb16988ae (patch) | |
| tree | 68141afe0eabf889f91abad76f786c85d751c15b | |
| parent | c4f9d23990e4b7d9eceb35d34ed259aa847d9a65 (diff) | |
| parent | 6a2b3aa90af03d6cc1f8970ebdb43c885a9cb251 (diff) | |
Merge pull request #18829 from DaveTBlake/Playm3unotfolder
[Music]Fix immediate playback of .m3u playlists on click when not playlistsasfolder
| -rw-r--r-- | xbmc/music/windows/GUIWindowMusicNav.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/xbmc/music/windows/GUIWindowMusicNav.cpp b/xbmc/music/windows/GUIWindowMusicNav.cpp index fb11c2c5b9..6df3a7f014 100644 --- a/xbmc/music/windows/GUIWindowMusicNav.cpp +++ b/xbmc/music/windows/GUIWindowMusicNav.cpp @@ -34,6 +34,7 @@ #include "playlists/PlayList.h" #include "playlists/PlayListFactory.h" #include "profiles/ProfileManager.h" +#include "settings/AdvancedSettings.h" #include "settings/Settings.h" #include "settings/SettingsComponent.h" #include "storage/MediaManager.h" @@ -349,6 +350,12 @@ bool CGUIWindowMusicNav::OnClick(int iItem, const std::string &player /* = "" */ if (item->IsMusicDb() && !item->m_bIsFolder) m_musicdatabase.SetPropertiesForFileItem(*item); + if (item->IsPlayList() && + !CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_playlistAsFolders) + { + PlayItem(iItem); + return true; + } return CGUIWindowMusicBase::OnClick(iItem, player); } |