SongFilter: "any" does not match file name

NEWS

@@ -5,6 +5,7 @@ ver 0.18 (2012/??/??)
 * protocol:
   - new command "readcomments" lists arbitrary file tags
   - new command "toggleoutput"
+  - "find"/"search" with "any" does not match file name
   - new commands "findin", "searchin" with base URI
   - search for album artist falls back to the artist tag
   - re-add the "volume" command

src/SongFilter.cxx

@@ -134,12 +134,9 @@ SongFilter::Item::Match(const Tag &_tag) const
 bool
 SongFilter::Item::Match(const Song &song) const
 {
-	if (tag == LOCATE_TAG_FILE_TYPE || tag == LOCATE_TAG_ANY_TYPE) {
+	if (tag == LOCATE_TAG_FILE_TYPE) {
 		const auto uri = song.GetURI();
-		const bool result = StringMatch(uri.c_str());
-
-		if (result || tag == LOCATE_TAG_FILE_TYPE)
-			return result;
+		return StringMatch(uri.c_str());
 	}
 
 	return song.tag != NULL && Match(*song.tag);