Index: apps/recorder/albumart.c
===================================================================
--- apps/recorder/albumart.c	(revision 20563)
+++ apps/recorder/albumart.c	(working copy)
@@ -110,7 +110,6 @@
     char dir[MAX_PATH + 1];
     bool found = false;
     const char *trackname;
-    const char *artist;
     int dirlen;
     int albumlen;
 
@@ -149,14 +148,24 @@
         found = file_exists(path);
     }
 
-    artist = id3->albumartist != NULL ? id3->albumartist : id3->artist;
+    if (!found && id3->albumartist != NULL && id3->album)
+    {
+        /* look in the albumart subdir of .rockbox */
+        snprintf(path, sizeof(path),
+                ROCKBOX_DIR "/albumart/%s-%s%s.bmp",
+                id3->albumartist,
+                id3->album,
+                size_string);
+        fix_path_part(path, strlen(ROCKBOX_DIR "/albumart/"), MAX_PATH);
+        found = file_exists(path);
+    }
 
-    if (!found && artist && id3->album)
+    if (!found && id3->artist != NULL && id3->album)
     {
         /* look in the albumart subdir of .rockbox */
         snprintf(path, sizeof(path),
                 ROCKBOX_DIR "/albumart/%s-%s%s.bmp",
-                artist,
+                id3->artist,
                 id3->album,
                 size_string);
         fix_path_part(path, strlen(ROCKBOX_DIR "/albumart/"), MAX_PATH);