From 625e3a335437b082ac5a3e723b8a4d4f4c2110db Mon Sep 17 00:00:00 2001 From: Christopher Eby Date: Sat, 22 May 2010 16:36:00 -0500 Subject: [PATCH] Fix a regression that prevented the song list from being filtered --- src/org/kreed/vanilla/MediaAdapter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/org/kreed/vanilla/MediaAdapter.java b/src/org/kreed/vanilla/MediaAdapter.java index 47c8edf3..173c4cd8 100644 --- a/src/org/kreed/vanilla/MediaAdapter.java +++ b/src/org/kreed/vanilla/MediaAdapter.java @@ -272,7 +272,10 @@ public class MediaAdapter extends CursorAdapter implements FilterQueryProvider { for (int j = 0; j != needles.length; ++i, ++j) { selectionArgs[i] = '%' + needles[j] + '%'; - if (i != 0) + // If we have something in the selection (i.e. i > 0), we must + // have something in the selection, so we can skip the more + // costly direct check of the selection length. + if (i != 0 || selection.length() != 0) selection.append(" AND "); selection.append(keys); selection.append(" LIKE ?");