Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #4059 from arnova/favourites_fix

fixed: We should't try to xml load favourites:// paths
  • Loading branch information...
commit 7a796f585798d4f688bfed2561877bcc0c95812f 2 parents 4ea0a7f + 726fcd3
Trent Nelson authored
Showing with 4 additions and 4 deletions.
  1. +4 −4 xbmc/filesystem/FavouritesDirectory.cpp
View
8 xbmc/filesystem/FavouritesDirectory.cpp
@@ -39,18 +39,18 @@ bool CFavouritesDirectory::GetDirectory(const CStdString& strPath, CFileItemList
{
items.Clear();
CURL url(strPath);
-
+
if (url.GetProtocol() == "favourites")
{
- Load(items); //load the default favourite files
+ return Load(items); //load the default favourite files
}
return LoadFavourites(strPath, items); //directly load the given file
}
-
+
bool CFavouritesDirectory::Exists(const char* strPath)
{
CURL url(strPath);
-
+
if (url.GetProtocol() == "favourites")
{
return XFILE::CFile::Exists("special://xbmc/system/favourites.xml")
Please sign in to comment.
Something went wrong with that request. Please try again.