summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2023-12-03 20:22:56 -0500
committerWilliam Wilgus <wilgus.william@gmail.com>2023-12-03 20:22:56 -0500
commit9e802be969ecc1d161fc6dec4e03b447394dc675 (patch)
tree74d0f4ad37a734eb813fcfd094dc6c87ec41653a
parent83566008a0caedcb67c0ee1937c8d993e73aae44 (diff)
downloadrockbox-9e802be969.tar.gz
rockbox-9e802be969.zip
[BugFix] run filebrowser automatically for out of tree shortcuts
missed a case for out of tree shortcuts coming from the quickscreen in the main menu Change-Id: I25714f9deaba5f0c88e50de03ead747733b7f568
-rw-r--r--apps/root_menu.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/apps/root_menu.c b/apps/root_menu.c
index 56b9918c40..e606d5cd68 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -1009,11 +1009,17 @@ void root_menu(void)
{
/* shortcuts may take several trips through the GO_TO_PLUGIN
case make sure we preserve and restore the origin */
- if (shortcut_origin != GO_TO_ROOT)
+ if(tree_get_context()->out_of_tree > 0) /* a shortcut has been selected */
{
- 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 = GO_TO_FILEBROWSER;
+ shortcut_origin = GO_TO_ROOT;
+ /* note in some cases there is a screen to return to
+ but the history is rewritten as if you browsed here
+ from the root so return there when finished */
+ }
+ else if (shortcut_origin != GO_TO_ROOT)
+ {
+ if (shortcut_origin != GO_TO_WPS)
next_screen = shortcut_origin;
shortcut_origin = GO_TO_ROOT;
}