summaryrefslogtreecommitdiffstats
path: root/apps/root_menu.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-06-09 09:41:16 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-06-09 09:41:16 +0000
commitc92b2cc16a8324b71e874e96cc828589b9f586fd (patch)
treea5195370eaea16719b38221f9828b904c99d4c31 /apps/root_menu.c
parentedf06dc0b2d7a8cc015f1b50d3994f861efd05aa (diff)
downloadrockbox-c92b2cc16a8324b71e874e96cc828589b9f586fd.tar.gz
rockbox-c92b2cc16a8324b71e874e96cc828589b9f586fd.tar.bz2
rockbox-c92b2cc16a8324b71e874e96cc828589b9f586fd.zip
fix a fun infinite loop when follow playlist is on and you started playback from PF and stopped it inside the WPS
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26718 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/root_menu.c')
-rw-r--r--apps/root_menu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/root_menu.c b/apps/root_menu.c
index c2f36892da..53c522a773 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -556,7 +556,7 @@ static int load_plugin_screen(char *plug_path)
ret_val = plugin_load(plug_path, NULL);
if (ret_val == PLUGIN_OK)
- ret_val = GO_TO_PREVIOUS;
+ ret_val = audio_status() ? GO_TO_PREVIOUS : GO_TO_ROOT;
if (ret_val == GO_TO_PREVIOUS)
last_screen = (old_previous == next_screen) ? GO_TO_ROOT : old_previous;
return ret_val;