summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexey Yakovenko <waker@users.sourceforge.net>2013-10-17 23:11:30 +0200
committerGravatar Alexey Yakovenko <waker@users.sourceforge.net>2013-10-17 23:11:30 +0200
commit71df01b9906352c22ec32aa99e1a5399f9526896 (patch)
tree082c0ef09b394fd774046d5ff58b0b5cc649f99c
parent60350fd75a0fbb59dab7161ebf602991243f9e51 (diff)
gtkui, artwork: fixed cover queues
-rw-r--r--plugins/artwork/artwork.c2
-rw-r--r--plugins/gtkui/coverart.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/artwork/artwork.c b/plugins/artwork/artwork.c
index 23d05886..613fd825 100644
--- a/plugins/artwork/artwork.c
+++ b/plugins/artwork/artwork.c
@@ -134,7 +134,7 @@ queue_add (const char *fname, const char *artist, const char *album, int img_siz
deadbeef->mutex_lock (mutex);
for (cover_query_t *q = queue; q; q = q->next) {
- if (!strcasecmp (artist, q->artist) || !strcasecmp (album, q->album)) {
+ if (!strcasecmp (artist, q->artist) && !strcasecmp (album, q->album) && img_size == q->size && callback == q->callback) {
deadbeef->mutex_unlock (mutex);
if (callback) {
callback (NULL, NULL, NULL, user_data);
diff --git a/plugins/gtkui/coverart.c b/plugins/gtkui/coverart.c
index 42b33085..bb4de51d 100644
--- a/plugins/gtkui/coverart.c
+++ b/plugins/gtkui/coverart.c
@@ -71,7 +71,7 @@ queue_add (const char *fname, int width, void (*callback) (void *user_data), voi
load_query_t *q;
if (fname) {
for (q = queue; q; q = q->next) {
- if (q->fname && !strcmp (q->fname, fname) && width == q->width) {
+ if (q->fname && !strcmp (q->fname, fname) && width == q->width && q->callback == callback) {
deadbeef->mutex_unlock (mutex);
return; // dupe
}