Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'menushortcuts' into everything

  • Loading branch information...
commit 397663e1212678268cfcbbb68ce2bae5580337e5 2 parents c4380e6 + 5580af0
@jdgordon authored
Showing with 2 additions and 5 deletions.
  1. +1 −3 apps/shortcuts.c
  2. +1 −2  apps/tree.c
View
4 apps/shortcuts.c
@@ -233,7 +233,7 @@ int readline_cb(int n, char *buf, void *parameters)
{
int t = 0;
for (t=0; t<SHORTCUT_TYPE_COUNT && sc->type == SHORTCUT_UNDEFINED; t++)
- if (!strncmp(value, type_strings[t], strlen(type_strings[t])))
+ if (!strcmp(value, type_strings[t]))
sc->type = t;
}
else if (!strcmp(name, "name"))
@@ -401,8 +401,6 @@ int do_shortcut_menu(void *ignored)
if (sc->type == SHORTCUT_FILE)
browse.flags |= BROWSE_RUNFILE;
done = rockbox_browse(&browse);
- if (done == GO_TO_ROOT)
- done = GO_TO_PREVIOUS;
}
break;
case SHORTCUT_SETTING:
View
3  apps/tree.c
@@ -708,7 +708,7 @@ static int dirbrowse(void)
exit_func = true;
break;
}
- if ((tc.dirlevel == 0) ||
+ if ((*tc.dirfilter == SHOW_ID3DB && tc.dirlevel == 0) ||
((*tc.dirfilter != SHOW_ID3DB && !strcmp(currdir,"/"))))
{
#ifdef HAVE_LCD_BITMAP /* charcell doesnt have ACTION_TREE_PGLEFT so this isnt needed */
@@ -1000,7 +1000,6 @@ int rockbox_browse(struct browse_context *browse)
tc.browse = browse;
strcpy(current, browse->root);
set_current_file(current);
- tc.dirlevel = 0;
if (browse->flags&BROWSE_RUNFILE)
ret_val = ft_enter(&tc);
else
Please sign in to comment.
Something went wrong with that request. Please try again.