Don't waste time loading v1 tag if a v2 tag was found.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2916 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 6 insertions, 3 deletions

diff --git a/firmware/id3.c b/firmware/id3.c
index 3ee25cac12..ed2724fe9f 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -737,9 +737,12 @@ bool mp3info(struct mp3entry *entry, char *filename)
         setid3v2title(fd, entry);
     entry->length = getsonglength(fd, entry);
 
-    entry->id3v1len = getid3v1len(fd);
-    if(entry->id3v1len && !entry->title)
-        setid3v1title(fd, entry);
+    /* only seek to end of file if no id3v2 tags were found */
+    if (!entry->id3v2len) {
+        entry->id3v1len = getid3v1len(fd);
+        if(entry->id3v1len && !entry->title)
+            setid3v1title(fd, entry);
+    }
 
     close(fd);