1 files changed, 2 insertions, 4 deletions

diff --git a/apps/codecs/aac.c b/apps/codecs/aac.c
index 34239864d1..309c05da38 100644
--- a/apps/codecs/aac.c
+++ b/apps/codecs/aac.c
@@ -78,8 +78,8 @@ next_track:
         goto exit;
     }
 
-    while (!*ci->taginfo_ready && !ci->stop_codec)
-        ci->sleep(1);
+    if (codec_wait_taginfo() != 0)
+        goto done;
   
     file_offset = ci->id3->offset;
 
@@ -304,8 +304,6 @@ next_track:
         i++;
     }
 
-    err = CODEC_OK;
-
 done:
     LOGF("AAC: Decoded %lu samples\n", (unsigned long)sound_samples_done);