summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2023-12-03 15:20:19 -0500
committerWilliam Wilgus <wilgus.william@gmail.com>2023-12-03 15:20:19 -0500
commit83566008a0caedcb67c0ee1937c8d993e73aae44 (patch)
treed30e76d265bc6b8a9f7021839cca71d2cbddfdaa
parent1e3e9c68c8c229127add0cb6e1bfa4a13314870d (diff)
downloadrockbox-83566008a0.tar.gz
rockbox-83566008a0.zip
[Feature] run filebrowser automatically for out of tree shortcuts
supersedes g#5499 run .link shortcuts within menu shortcuts and just extends it to the whole plugin stack which makes sense as long as it doesn't cause any new bugs ;) Change-Id: If152f53cf6894430c1173a2af1410e7d0857825e
-rw-r--r--apps/root_menu.c4
-rw-r--r--apps/shortcuts.c5
2 files changed, 3 insertions, 6 deletions
diff --git a/apps/root_menu.c b/apps/root_menu.c
index 5709e7ac42..56b9918c40 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -1011,7 +1011,9 @@ void root_menu(void)
case make sure we preserve and restore the origin */
if (shortcut_origin != GO_TO_ROOT)
{
- if (shortcut_origin != GO_TO_WPS)
+ if(tree_get_context()->out_of_tree > 0) /* a shortcut has been selected */
+ next_screen = GO_TO_FILEBROWSER;
+ else if (shortcut_origin != GO_TO_WPS)
next_screen = shortcut_origin;
shortcut_origin = GO_TO_ROOT;
}
diff --git a/apps/shortcuts.c b/apps/shortcuts.c
index 2ac3ceb3a0..ad19ec14fc 100644
--- a/apps/shortcuts.c
+++ b/apps/shortcuts.c
@@ -620,11 +620,6 @@ int do_shortcut_menu(void *ignored)
while (done == GO_TO_PREVIOUS)
{
list.count = shortcut_count;
- if(tree_get_context()->out_of_tree > 0) /* a shortcut has been selected */
- {
- done = GO_TO_FILEBROWSER;
- break;
- }
if (simplelist_show_list(&list))
break; /* some error happened?! */