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

3 files changed, 9 insertions, 4 deletions

diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c
index b5113df8f6..f1c95ffef2 100644
--- a/apps/gui/quickscreen.c
+++ b/apps/gui/quickscreen.c
@@ -398,7 +398,7 @@ static const struct settings_list *get_setting(int gs_value,
     return defaultval;
 }
 
-bool quick_screen_quick(int button_enter)
+int quick_screen_quick(int button_enter)
 {
     struct gui_quickscreen qs;
     bool oldshuffle = global_settings.playlist_shuffle;
@@ -439,7 +439,7 @@ bool quick_screen_quick(int button_enter)
                 playlist_sort(NULL, true);
         }
     }
-    return usb;
+    return (usb ? 1:0);
 }
 
 /* stuff to make the quickscreen configurable */
diff --git a/apps/gui/quickscreen.h b/apps/gui/quickscreen.h
index acce5cf9bf..015928ee8a 100644
--- a/apps/gui/quickscreen.h
+++ b/apps/gui/quickscreen.h
@@ -43,7 +43,7 @@ struct gui_quickscreen
                                                     item is changed */
 };
 
-extern bool quick_screen_quick(int button_enter);
+extern int quick_screen_quick(int button_enter);
 int quickscreen_set_option(void *data);
 bool is_setting_quickscreenable(const struct settings_list *setting);
 void set_as_qs_item(const struct settings_list *setting,
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 846c952baf..78ab8dc8dd 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -836,7 +836,12 @@ long gui_wps_show(void)
             case ACTION_WPS_QUICKSCREEN:
             {
                 gwps_leave_wps();
-                if (quick_screen_quick(button))
+                if (global_settings.shortcuts_replaces_qs)
+                {
+                    global_status.last_screen = GO_TO_SHORTCUTMENU;
+                    return quick_screen_quick(button);
+                }
+                else if (quick_screen_quick(button) > 0)
                     return GO_TO_ROOT;
                 restore = true;
             }