diff options
author | Miika Pekkarinen <miipekk@ihme.org> | 2006-08-05 07:29:53 +0000 |
---|---|---|
committer | Miika Pekkarinen <miipekk@ihme.org> | 2006-08-05 07:29:53 +0000 |
commit | b591bb3f465f30433ba694ff046cf25ab3a6ffd9 (patch) | |
tree | 458a05f79117b0b4c27c1731fc2e4cb1a553ca57 | |
parent | 8e0b02a60f35a6a441fff782a76aba4b80332906 (diff) | |
download | rockbox-b591bb3f465f30433ba694ff046cf25ab3a6ffd9.tar.gz rockbox-b591bb3f465f30433ba694ff046cf25ab3a6ffd9.zip |
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
-rw-r--r-- | apps/playback.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/playback.c b/apps/playback.c index e7a20fb1af..11d266b92f 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) | |||
694 | break; | 694 | break; |
695 | 695 | ||
696 | case SYS_USB_CONNECTED: | 696 | case SYS_USB_CONNECTED: |
697 | logf("USB: Audio core"); | 697 | logf("USB: Voice codec"); |
698 | usb_acknowledge(SYS_USB_CONNECTED_ACK); | 698 | usb_acknowledge(SYS_USB_CONNECTED_ACK); |
699 | if (audio_codec_loaded) | 699 | if (audio_codec_loaded) |
700 | swap_codec(); | 700 | swap_codec(); |
@@ -1970,7 +1970,7 @@ static void audio_stop_playback(void) | |||
1970 | 1970 | ||
1971 | if (voice_is_playing) | 1971 | if (voice_is_playing) |
1972 | { | 1972 | { |
1973 | while (voice_is_playing || !queue_empty(&voice_codec_queue)) | 1973 | while (voice_is_playing && !queue_empty(&voice_codec_queue)) |
1974 | yield(); | 1974 | yield(); |
1975 | } | 1975 | } |
1976 | 1976 | ||