From 9aef4f1e0459d9aef1874f51c57e3d889af63c4b Mon Sep 17 00:00:00 2001 From: DaveTBlake Date: Fri, 5 Jul 2019 08:47:44 +0100 Subject: [PATCH] Fix PlayMedia when item is a playlist or smart playlist that needs to be recursively expanded --- xbmc/interfaces/builtins/PlayerBuiltins.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/interfaces/builtins/PlayerBuiltins.cpp b/xbmc/interfaces/builtins/PlayerBuiltins.cpp index dabb959e65243..4008e1f5c1156 100644 --- a/xbmc/interfaces/builtins/PlayerBuiltins.cpp +++ b/xbmc/interfaces/builtins/PlayerBuiltins.cpp @@ -429,7 +429,7 @@ static int PlayMedia(const std::vector& params) if ( CGUIWindowVideoBase::ShowResumeMenu(item) == false ) return false; } - if (item.m_bIsFolder || item.IsPlayList() || item.IsSmartPlayList()) + if (item.m_bIsFolder) { CFileItemList items; std::string extensions = CServiceBroker::GetFileExtensionProvider().GetVideoExtensions() + "|" + CServiceBroker::GetFileExtensionProvider().GetMusicExtensions(); @@ -471,7 +471,7 @@ static int PlayMedia(const std::vector& params) return 0; } } - if (item.IsAudio() || item.IsVideo()) + if ((item.IsAudio() || item.IsVideo()) && !item.IsPlayList() && !item.IsSmartPlayList()) CServiceBroker::GetPlaylistPlayer().Play(std::make_shared(item), ""); else g_application.PlayMedia(item, "", PLAYLIST_NONE);