diff options
author | William Wilgus <wilgus.william@gmail.com> | 2021-03-07 10:07:49 -0500 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2021-03-07 10:07:49 -0500 |
commit | 9712d375ce31d8394cc30b9121577a7646c1af12 (patch) | |
tree | 15496f9654ae0fbeecb50017d48b34f2f6463216 /apps/root_menu.c | |
parent | 0dce97372987a0b25446c33c7bfd616780d9d7c0 (diff) | |
download | rockbox-9712d375ce31d8394cc30b9121577a7646c1af12.tar.gz rockbox-9712d375ce31d8394cc30b9121577a7646c1af12.zip |
Shortcuts.c -- Update
Fix returns from shortcuts -- should now run plugins
Fix formatting of file names to remove path from browser shortcuts
Change-Id: I46e337110d04b84bedcb0c2945d5dd29a1860847
Diffstat (limited to 'apps/root_menu.c')
-rw-r--r-- | apps/root_menu.c | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/apps/root_menu.c b/apps/root_menu.c index 77a092018a..fb7b5218e2 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c | |||
@@ -822,21 +822,27 @@ void root_menu(void) | |||
822 | case GO_TO_PLUGIN: | 822 | case GO_TO_PLUGIN: |
823 | { | 823 | { |
824 | char *key; | 824 | char *key; |
825 | switch (last_screen) | 825 | if (global_status.last_screen == GO_TO_SHORTCUTMENU) |
826 | { | 826 | { |
827 | case GO_TO_ROOT: | 827 | global_status.last_screen = last_screen; |
828 | key = ID2P(LANG_START_SCREEN); | 828 | key = ID2P(LANG_SHORTCUTS); |
829 | break; | ||
830 | case GO_TO_WPS: | ||
831 | key = ID2P(LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN); | ||
832 | break; | ||
833 | case GO_TO_SHORTCUTMENU: | ||
834 | key = ID2P(LANG_SHORTCUTS); | ||
835 | break; | ||
836 | default: | ||
837 | key = ID2P(LANG_OPEN_PLUGIN); | ||
838 | break; | ||
839 | } | 829 | } |
830 | else | ||
831 | switch (last_screen) | ||
832 | { | ||
833 | case GO_TO_ROOT: | ||
834 | key = ID2P(LANG_START_SCREEN); | ||
835 | break; | ||
836 | case GO_TO_WPS: | ||
837 | key = ID2P(LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN); | ||
838 | break; | ||
839 | case GO_TO_SHORTCUTMENU: | ||
840 | key = ID2P(LANG_SHORTCUTS); | ||
841 | break; | ||
842 | default: | ||
843 | key = ID2P(LANG_OPEN_PLUGIN); | ||
844 | break; | ||
845 | } | ||
840 | 846 | ||
841 | open_plugin_get_entry(key, &open_plugin_entry); | 847 | open_plugin_get_entry(key, &open_plugin_entry); |
842 | char *path = open_plugin_entry.path; | 848 | char *path = open_plugin_entry.path; |