summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2006-08-05 07:29:53 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2006-08-05 07:29:53 +0000
commitb591bb3f465f30433ba694ff046cf25ab3a6ffd9 (patch)
tree458a05f79117b0b4c27c1731fc2e4cb1a553ca57 /apps
parent8e0b02a60f35a6a441fff782a76aba4b80332906 (diff)
downloadrockbox-b591bb3f465f30433ba694ff046cf25ab3a6ffd9.zip
rockbox-b591bb3f465f30433ba694ff046cf25ab3a6ffd9.tar.gz
rockbox-b591bb3f465f30433ba694ff046cf25ab3a6ffd9.tar.bz2
rockbox-b591bb3f465f30433ba694ff046cf25ab3a6ffd9.tar.xz
FS#5691 Fix for crash if stop pressed during voice output.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10457 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/playback.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/playback.c b/apps/playback.c
index e7a20fb..11d266b 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -694,7 +694,7 @@ static void* voice_request_buffer_callback(size_t *realsize, size_t reqsize)
break;
case SYS_USB_CONNECTED:
- logf("USB: Audio core");
+ logf("USB: Voice codec");
usb_acknowledge(SYS_USB_CONNECTED_ACK);
if (audio_codec_loaded)
swap_codec();
@@ -1970,7 +1970,7 @@ static void audio_stop_playback(void)
if (voice_is_playing)
{
- while (voice_is_playing || !queue_empty(&voice_codec_queue))
+ while (voice_is_playing && !queue_empty(&voice_codec_queue))
yield();
}