Merge branch 'mpd-2100-nested-and' of https://github.com/m7a/mpd

This commit is contained in:
Max Kellermann 2024-08-30 12:57:20 +02:00
commit a3a07280e8
1 changed files with 2 additions and 2 deletions

View File

@ -326,7 +326,7 @@ SongFilter::ParseExpression(const char *&s, bool fold_case)
if (*s == '(') { if (*s == '(') {
auto first = ParseExpression(s, fold_case); auto first = ParseExpression(s, fold_case);
if (*s == ')') { if (*s == ')') {
++s; s = StripLeft(s + 1);
return first; return first;
} }
@ -340,7 +340,7 @@ SongFilter::ParseExpression(const char *&s, bool fold_case)
and_filter->AddItem(ParseExpression(s, fold_case)); and_filter->AddItem(ParseExpression(s, fold_case));
if (*s == ')') { if (*s == ')') {
++s; s = StripLeft(s + 1);
return and_filter; return and_filter;
} }