diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2010-09-01 14:12:14 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-09-01 14:12:14 +0000 |
| commit | 21c7b9debbade715f7cf79d04e5fe8b22d067c7b (patch) | |
| tree | 636d77485b6fd91afd00dfa75b7e8a0fcb63fafa /apps | |
| parent | ff8089789b7977c8e80d0cded69711e088e6a3c2 (diff) | |
| download | rockbox-21c7b9debbade715f7cf79d04e5fe8b22d067c7b.zip rockbox-21c7b9debbade715f7cf79d04e5fe8b22d067c7b.tar.gz rockbox-21c7b9debbade715f7cf79d04e5fe8b22d067c7b.tar.bz2 rockbox-21c7b9debbade715f7cf79d04e5fe8b22d067c7b.tar.xz | |
load_plugin_screen(): handle all plugin_load() return values
Fixes crashes when pictureflow returns PLUGIN_GOTO_WPS
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27965 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/root_menu.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/apps/root_menu.c b/apps/root_menu.c index 7f882cd..0f2e38e 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c @@ -558,9 +558,19 @@ static int load_plugin_screen(char *plug_path) global_status.last_screen = (char)next_screen; status_save(); - ret_val = plugin_load(plug_path, NULL); - if (ret_val == PLUGIN_OK) + switch (plugin_load(plug_path, NULL)) + { + case PLUGIN_GOTO_WPS: + ret_val = GO_TO_WPS; + break; + case PLUGIN_OK: ret_val = audio_status() ? GO_TO_PREVIOUS : GO_TO_ROOT; + break; + default: + ret_val = GO_TO_PREVIOUS; + break; + } + if (ret_val == GO_TO_PREVIOUS) last_screen = (old_previous == next_screen) ? GO_TO_ROOT : old_previous; return ret_val; |