aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormontellese <montellese@xbmc.org>2014-11-22 23:53:58 +0100
committermontellese <montellese@xbmc.org>2014-11-22 23:53:58 +0100
commit05150adf683bb8d24e76e7a0ceec216dccaf1ff6 (patch)
tree78c765ebf0118a8d5736d7b8606cf9d9c88cf407
parent9f35a93b93eb4f688e2dde6e7ef873465c57ce2d (diff)
musicdb: fix conflicting "singles" filter option introduced by 9fbf13eded5d682d4ae210043e536895c9356c18 (fixes #15539)
-rw-r--r--xbmc/music/MusicDatabase.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp
index d6267a2527..ea3ac5a0bc 100644
--- a/xbmc/music/MusicDatabase.cpp
+++ b/xbmc/music/MusicDatabase.cpp
@@ -3003,7 +3003,7 @@ bool CMusicDatabase::GetAlbumsByYear(const CStdString& strBaseDir, CFileItemList
return false;
musicUrl.AddOption("year", year);
- musicUrl.AddOption("singles", true); // allow singles to be listed
+ musicUrl.AddOption("show_singles", true); // allow singles to be listed
Filter filter;
return GetAlbumsByWhere(musicUrl.ToString(), filter, items);
@@ -5603,7 +5603,7 @@ bool CMusicDatabase::GetFilter(CDbUrl &musicUrl, Filter &filter, SortDescription
// no artist given, so exclude any single albums (aka empty tagged albums)
else
{
- option = options.find("singles");
+ option = options.find("show_singles");
if (option == options.end() || !option->second.asBoolean())
filter.AppendWhere("albumview.strAlbum <> ''");
}