diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-11-04 12:40:18 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-11-04 12:40:18 +0000 |
| commit | a6f2b82803d5b48f1c16e630d14883ec0a474dbe (patch) | |
| tree | 318b3322b025fd252502676ae6062681e558fd03 /apps/gui | |
| parent | 62decc42e7f6752d786090277ac4b7f2d2036ad4 (diff) | |
| download | rockbox-a6f2b82803d5b48f1c16e630d14883ec0a474dbe.zip rockbox-a6f2b82803d5b48f1c16e630d14883ec0a474dbe.tar.gz rockbox-a6f2b82803d5b48f1c16e630d14883ec0a474dbe.tar.bz2 rockbox-a6f2b82803d5b48f1c16e630d14883ec0a474dbe.tar.xz | |
revert my previous commit and do it in a much less hacky way (both of these were for FS#8084)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15458 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
| -rw-r--r-- | apps/gui/gwps.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 1e5720e..b7707cd 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c @@ -241,8 +241,10 @@ long gui_wps_show(void) #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 show_remote_main_backdrop(); #endif - if (onplay(wps_state.id3->path, FILE_ATTR_AUDIO, CONTEXT_WPS) - == ONPLAY_MAINMENU) + /* if music is stopped in the context menu we want to exit the wps */ + if (onplay(wps_state.id3->path, + FILE_ATTR_AUDIO, CONTEXT_WPS) == ONPLAY_MAINMENU + || !audio_status()) return GO_TO_ROOT; #if LCD_DEPTH > 1 show_wps_backdrop(); |