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

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