aboutsummaryrefslogtreecommitdiffstats
path: root/src/songvec.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/songvec.c')
-rw-r--r--src/songvec.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/songvec.c b/src/songvec.c
index 7b0607dd9..df600f92a 100644
--- a/src/songvec.c
+++ b/src/songvec.c
@@ -96,18 +96,22 @@ songvec_for_each(const struct songvec *sv,
int (*fn)(struct song *, void *), void *arg)
{
size_t i;
+ size_t prev_nr;
pthread_mutex_lock(&nr_lock);
- for (i = 0; i < sv->nr; ++i) {
+ for (i = 0; i < sv->nr; ) {
struct song *song = sv->base[i];
assert(song);
assert(*song->url);
+ prev_nr = sv->nr;
pthread_mutex_unlock(&nr_lock); /* fn() may block */
if (fn(song, arg) < 0)
return -1;
pthread_mutex_lock(&nr_lock); /* sv->nr may change in fn() */
+ if (prev_nr == sv->nr)
+ ++i;
}
pthread_mutex_unlock(&nr_lock);