oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge tag 'v0.20.22'

Browse Source 
release v0.20.22
This commit is contained in:
Max Kellermann
2018-10-23 20:10:57 +02:00
parent 66ab2de578 9274bc15bc
commit c2a2573aa5
5 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/song/TagSongFilter.cxx
View File

@@ -54,15 +54,6 @@ TagSongFilter::MatchNN(const Tag &tag) const noexcept
}
if (type < TAG_NUM_OF_ITEM_TYPES && !visited_types[type]) {
/* If the search critieron was not visited during the
sweep through the song's tag, it means this field
is absent from the tag or empty. Thus, if the
searched string is also empty
then it's a match as well and we should return
true. */
if (filter.empty())
return true;
bool result = false;
if (ApplyTagFallback(type,
[&](TagType tag2) {
@@ -80,6 +71,15 @@ TagSongFilter::MatchNN(const Tag &tag) const noexcept
return true;
}))
return result;
/* If the search critieron was not visited during the
sweep through the song's tag, it means this field
is absent from the tag or empty. Thus, if the
searched string is also empty
then it's a match as well and we should return
true. */
if (filter.empty())
return true;
}
return false;