1 files changed, 3 insertions, 2 deletions

diff --git a/apps/codecs/shorten.c b/apps/codecs/shorten.c
index 7595ca30c7..83a9c34da8 100644
--- a/apps/codecs/shorten.c
+++ b/apps/codecs/shorten.c
@@ -57,8 +57,8 @@ next_track:
         return CODEC_ERROR;
     }
 
-    while (!*ci->taginfo_ready)
-        ci->yield();
+    if (codec_wait_taginfo() != 0)
+        goto request_next_track;
 
     codec_set_replaygain(ci->id3);
 
@@ -153,6 +153,7 @@ seek_start:
         sc.bitindex = sc.gb.index - 8*consumed;
     }
 
+request_next_track:
     if (ci->request_next_track())
         goto next_track;