Index: apps/playback.c
===================================================================
--- apps/playback.c	(revision 21477)
+++ apps/playback.c	(working copy)
@@ -1402,6 +1402,7 @@
                             if (codec_requested_stop)
                             {
                                 LOGFQUEUE("codec > audio Q_AUDIO_STOP");
+                                pcmbuf_play_remainder();
                                 queue_post(&audio_queue, Q_AUDIO_STOP, 0);
                             }
                             break;
@@ -2182,8 +2183,6 @@
     /* If we were playing, save resume information */
     if (playing)
     {
-        pcmbuf_play_remainder();
-    
         struct mp3entry *id3 = NULL;
 
         if (!ci.stop_codec)