Index: apps/playback.c
===================================================================
RCS file: /cvsroot/rockbox/apps/playback.c,v
retrieving revision 1.326
diff -u -r1.326 playback.c
--- apps/playback.c	18 Jul 2006 21:10:13 -0000	1.326
+++ apps/playback.c	21 Jul 2006 20:20:07 -0000
@@ -1845,7 +1845,7 @@
     }
 
     if (voice_is_playing)
-        while (voice_is_playing || !queue_empty(&voice_codec_queue))
+        while (!queue_empty(&voice_codec_queue))
             yield();
 
     filebufused = 0;
@@ -1870,6 +1870,9 @@
         radio_stop();
 #endif
 
+    /* Cancel any current voice */
+    talk_id(VOICE_PAUSE, false);
+
     /* Wait for any previously playing audio to flush - TODO: Not necessary? */
     while (audio_codec_loaded)
         stop_codec_flush();