summaryrefslogtreecommitdiffstats
path: root/apps/menu.c
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2021-03-07 10:07:49 -0500
committerWilliam Wilgus <wilgus.william@gmail.com>2021-03-07 10:07:49 -0500
commit9712d375ce31d8394cc30b9121577a7646c1af12 (patch)
tree15496f9654ae0fbeecb50017d48b34f2f6463216 /apps/menu.c
parent0dce97372987a0b25446c33c7bfd616780d9d7c0 (diff)
downloadrockbox-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/menu.c')
-rw-r--r--apps/menu.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/menu.c b/apps/menu.c
index fefc8fca2b..30a098f331 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -427,7 +427,13 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
#ifdef HAVE_QUICKSCREEN
else if (action == ACTION_STD_QUICKSCREEN)
{
- quick_screen_quick(action);
+ if (global_settings.shortcuts_replaces_qs)
+ {
+ global_status.last_screen = GO_TO_SHORTCUTMENU;
+ ret = quick_screen_quick(action);
+ }
+ else
+ quick_screen_quick(action);
redraw_lists = true;
}
#endif