summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-06-16 02:52:43 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-06-16 02:52:43 +0000
commit014dc784f355f2375a33cc19acc8070035848d29 (patch)
tree0ac7cb9f9e0186e6a491f2d2d5cb38323f1c0aad
parente0f7b7a830cc7695d3f857938a4423ab63b851c4 (diff)
downloadrockbox-014dc784f355f2375a33cc19acc8070035848d29.tar.gz
rockbox-014dc784f355f2375a33cc19acc8070035848d29.zip
quick fix for FS#9046 - dont let jpeg.rock enter the playback menu if its using the audiobuffer
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17727 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/jpeg.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c
index a05eaa72dc..4daecd934a 100644
--- a/apps/plugins/jpeg.c
+++ b/apps/plugins/jpeg.c
@@ -2601,7 +2601,14 @@ int show_menu(void) /* return 1 to quit */
2601 2601
2602#if PLUGIN_BUFFER_SIZE >= MIN_MEM 2602#if PLUGIN_BUFFER_SIZE >= MIN_MEM
2603 case MIID_SHOW_PLAYBACK_MENU: 2603 case MIID_SHOW_PLAYBACK_MENU:
2604 playback_control(rb, NULL); 2604 if (plug_buf)
2605 {
2606 playback_control(rb, NULL);
2607 }
2608 else
2609 {
2610 rb->splash(HZ, "Cannot restart playback");
2611 }
2605 break; 2612 break;
2606#endif 2613#endif
2607#ifdef HAVE_LCD_COLOR 2614#ifdef HAVE_LCD_COLOR