1 files changed, 14 insertions, 3 deletions

diff --git a/lib/rbcodec/codecs/aiff.c b/lib/rbcodec/codecs/aiff.c
index 3bedfa5760..9fee781c03 100644
--- a/lib/rbcodec/codecs/aiff.c
+++ b/lib/rbcodec/codecs/aiff.c
@@ -99,6 +99,7 @@ enum codec_status codec_run(void)
     codec_set_replaygain(ci->id3);
     
     /* Need to save offset for later use (cleared indirectly by advance_buffer) */
+    param = ci->id3->elapsed;
     bytesdone = ci->id3->offset;
 
     /* assume the AIFF header is less than 1024 bytes */
@@ -270,10 +271,20 @@ enum codec_status codec_run(void)
     ci->advance_buffer(firstblockposn);
 
     /* make sure we're at the correct offset */
-    if (bytesdone > (uint32_t) firstblockposn) {
+    if (bytesdone > (uint32_t) firstblockposn || param) {
+        uint32_t seek_val;
+        int seek_mode;
+
+        if (bytesdone) {
+            seek_val = bytesdone - MIN((uint32_t) firstblockposn, bytesdone);
+            seek_mode = PCM_SEEK_POS;
+        } else {
+            seek_val = param;
+            seek_mode = PCM_SEEK_TIME;
+        }
+
         /* Round down to previous block */
-        struct pcm_pos *newpos = codec->get_seek_pos(bytesdone - firstblockposn,
-                                                     PCM_SEEK_POS, NULL);
+        struct pcm_pos *newpos = codec->get_seek_pos(seek_val, seek_mode, NULL);
 
         if (newpos->pos > format.numbytes)
             return CODEC_OK;