1 files changed, 3 insertions, 2 deletions

diff --git a/apps/codecs/asap.c b/apps/codecs/asap.c
index bcb47a717d..9447c738d2 100644
--- a/apps/codecs/asap.c
+++ b/apps/codecs/asap.c
@@ -44,8 +44,8 @@ next_track:
         return CODEC_ERROR;
     }
 
-    while (!*ci->taginfo_ready && !ci->stop_codec)
-        ci->sleep(1);
+    if (codec_wait_taginfo() != 0)
+        goto request_next_track;
 
     codec_set_replaygain(ci->id3);
         
@@ -130,6 +130,7 @@ next_track:
             break;
     }
 
+request_next_track:
     if (ci->request_next_track())
         goto next_track;