1 files changed, 5 insertions, 4 deletions

diff --git a/apps/codecs/wav.c b/apps/codecs/wav.c
index e286f4dc6a..e179470f27 100644
--- a/apps/codecs/wav.c
+++ b/apps/codecs/wav.c
@@ -153,7 +153,7 @@ static uint8_t *read_buffer(size_t *realsize)
 /* this is the codec entry point */
 enum codec_status codec_main(void)
 {
-    int status = CODEC_OK;
+    int status;
     uint32_t decodedsamples;
     size_t n;
     int bufcount;
@@ -168,14 +168,16 @@ enum codec_status codec_main(void)
     ci->configure(DSP_SET_SAMPLE_DEPTH, PCM_OUTPUT_DEPTH-1);
   
 next_track:
+    status = CODEC_OK;
+
     if (codec_init()) {
         DEBUGF("codec_init() error\n");
         status = CODEC_ERROR;
         goto exit;
     }
 
-    while (!*ci->taginfo_ready && !ci->stop_codec)
-        ci->sleep(1);
+    if (codec_wait_taginfo() != 0)
+        goto done;
 
     codec_set_replaygain(ci->id3);
     
@@ -437,7 +439,6 @@ next_track:
             endofstream = 1;
         ci->set_elapsed(decodedsamples*1000LL/ci->id3->frequency);
     }
-    status = CODEC_OK;
 
 done:
     if (ci->request_next_track())