diff options
author | William Wilgus <wilgus.william@gmail.com> | 2023-12-03 15:20:19 -0500 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2023-12-03 15:20:19 -0500 |
commit | 83566008a0caedcb67c0ee1937c8d993e73aae44 (patch) | |
tree | d30e76d265bc6b8a9f7021839cca71d2cbddfdaa | |
parent | 1e3e9c68c8c229127add0cb6e1bfa4a13314870d (diff) | |
download | rockbox-83566008a0caedcb67c0ee1937c8d993e73aae44.tar.gz rockbox-83566008a0caedcb67c0ee1937c8d993e73aae44.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.c | 4 | ||||
-rw-r--r-- | apps/shortcuts.c | 5 |
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) | |||
1011 | case make sure we preserve and restore the origin */ | 1011 | case make sure we preserve and restore the origin */ |
1012 | if (shortcut_origin != GO_TO_ROOT) | 1012 | if (shortcut_origin != GO_TO_ROOT) |
1013 | { | 1013 | { |
1014 | if (shortcut_origin != GO_TO_WPS) | 1014 | if(tree_get_context()->out_of_tree > 0) /* a shortcut has been selected */ |
1015 | next_screen = GO_TO_FILEBROWSER; | ||
1016 | else if (shortcut_origin != GO_TO_WPS) | ||
1015 | next_screen = shortcut_origin; | 1017 | next_screen = shortcut_origin; |
1016 | shortcut_origin = GO_TO_ROOT; | 1018 | shortcut_origin = GO_TO_ROOT; |
1017 | } | 1019 | } |
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) | |||
620 | while (done == GO_TO_PREVIOUS) | 620 | while (done == GO_TO_PREVIOUS) |
621 | { | 621 | { |
622 | list.count = shortcut_count; | 622 | list.count = shortcut_count; |
623 | if(tree_get_context()->out_of_tree > 0) /* a shortcut has been selected */ | ||
624 | { | ||
625 | done = GO_TO_FILEBROWSER; | ||
626 | break; | ||
627 | } | ||
628 | 623 | ||
629 | if (simplelist_show_list(&list)) | 624 | if (simplelist_show_list(&list)) |
630 | break; /* some error happened?! */ | 625 | break; /* some error happened?! */ |