diff options
| author | DaveTBlake <oak99sky@yahoo.co.uk> | 2019-04-06 09:55:45 +0100 |
|---|---|---|
| committer | DaveTBlake <oak99sky@yahoo.co.uk> | 2019-04-06 14:38:44 +0100 |
| commit | 6b261b7e582fb44600ec8fe06fe193c8480c948d (patch) | |
| tree | 11a7b8a6c07205334e40f0f0cdc86d965cac336a | |
| parent | 4eb34ebe68452821b97befbcc4a8fcb663924f5b (diff) | |
Fix loader skipping music files that are in library but located on a server hence have dynpath starting "HTTP" and IsInternetStream returns true.
| -rw-r--r-- | xbmc/guilib/guiinfo/MusicGUIInfo.cpp | 2 | ||||
| -rw-r--r-- | xbmc/music/MusicInfoLoader.cpp | 4 | ||||
| -rw-r--r-- | xbmc/music/windows/GUIWindowMusicBase.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/xbmc/guilib/guiinfo/MusicGUIInfo.cpp b/xbmc/guilib/guiinfo/MusicGUIInfo.cpp index 12ee8aa6e7..121c5fb803 100644 --- a/xbmc/guilib/guiinfo/MusicGUIInfo.cpp +++ b/xbmc/guilib/guiinfo/MusicGUIInfo.cpp @@ -49,7 +49,7 @@ bool CMusicGUIInfo::InitCurrentItem(CFileItem *item) tag->SetLoaded(true); // find a thumb for this file. - if (item->IsInternetStream()) + if (item->IsInternetStream() && !item->IsMusicDb()) { if (!g_application.m_strPlayListFile.empty()) { diff --git a/xbmc/music/MusicInfoLoader.cpp b/xbmc/music/MusicInfoLoader.cpp index 754ae16c53..9860975667 100644 --- a/xbmc/music/MusicInfoLoader.cpp +++ b/xbmc/music/MusicInfoLoader.cpp @@ -150,7 +150,7 @@ bool CMusicInfoLoader::LoadItemCached(CFileItem* pItem) pItem->IsPlayList() || pItem->IsSmartPlayList() || StringUtils::StartsWithNoCase(pItem->GetPath(), "newplaylist://") || StringUtils::StartsWithNoCase(pItem->GetPath(), "newsmartplaylist://") || - pItem->IsNFO() || pItem->IsInternetStream()) + pItem->IsNFO() || (pItem->IsInternetStream() && !pItem->IsMusicDb())) return false; // Get thumb for item @@ -168,7 +168,7 @@ bool CMusicInfoLoader::LoadItemLookup(CFileItem* pItem) pItem->IsPlayList() || pItem->IsSmartPlayList() || StringUtils::StartsWithNoCase(pItem->GetPath(), "newplaylist://") || StringUtils::StartsWithNoCase(pItem->GetPath(), "newsmartplaylist://") || - pItem->IsNFO() || pItem->IsInternetStream()) + pItem->IsNFO() || (pItem->IsInternetStream() && !pItem->IsMusicDb())) return false; if (!pItem->HasMusicInfoTag() || !pItem->GetMusicInfoTag()->Loaded()) diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp index f7504ce985..ca8931e4a7 100644 --- a/xbmc/music/windows/GUIWindowMusicBase.cpp +++ b/xbmc/music/windows/GUIWindowMusicBase.cpp @@ -476,7 +476,7 @@ void CGUIWindowMusicBase::AddItemToPlayList(const CFileItemPtr &pItem, CFileItem return; } } - else if(pItem->IsInternetStream()) + else if(pItem->IsInternetStream() && !pItem->IsMusicDb()) { // just queue the internet stream, it will be expanded on play queuedItems.Add(pItem); } |