Enable access to Shortcuts Menu from QuickScreen

Offers a quick way of switching to the Shortcuts Menu
by pressing the 'context menu' button while QuickScreen
is active (e.g. long press Select on iPods and some other
players)

Change-Id: I38292c7070cf093a81e1db688809b1f0d6a8764a

1 files changed, 3 insertions, 4 deletions

diff --git a/apps/menu.c b/apps/menu.c
index 85dac8a214..c86ada1986 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -455,14 +455,13 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
 #ifdef HAVE_QUICKSCREEN
         else if (action == ACTION_STD_QUICKSCREEN)
         {
-            if (global_settings.shortcuts_replaces_qs)
+            if (global_settings.shortcuts_replaces_qs ||
+                quick_screen_quick(action) == QUICKSCREEN_GOTO_SHORTCUTS_MENU)
             {
                 global_status.last_screen = GO_TO_SHORTCUTMENU;
-                ret = quick_screen_quick(action);
+                ret = do_shortcut_menu(NULL);
                 done = true;
             }
-            else
-                quick_screen_quick(action);
             redraw_lists = true;
         }
 #endif