devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

FS#7002 - Fix a bug in parser of tagnavi.config preventing to set first menu as the root menu.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13130 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Miika Pekkarinen 2007-04-12 18:33:40 +00:00
parent 0569fae8ec
commit e6de6e5f8a
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
apps/tagtree.c
View file

@ -793,7 +793,7 @@ static int parse_line(int n, const char *buf, void *parameters)
case var_rootmenu: case var_rootmenu:
/* Only set root menu once. */ /* Only set root menu once. */
if (root_menu) if (root_menu >= 0)
break; break;
if (get_token_str(data, sizeof(data)) < 0) if (get_token_str(data, sizeof(data)) < 0)
@ -868,9 +868,14 @@ void tagtree_init(void)
format_count = 0; format_count = 0;
menu_count = 0; menu_count = 0;
menu = NULL; menu = NULL;
root_menu = 0; root_menu = -1;
parse_menu(FILE_SEARCH_INSTRUCTIONS); parse_menu(FILE_SEARCH_INSTRUCTIONS);
/* If no root menu is set, assume it's the first single menu
* we have. That shouldn't normally happen. */
if (root_menu < 0)
root_menu = 0;
uniqbuf = buffer_alloc(UNIQBUF_SIZE); uniqbuf = buffer_alloc(UNIQBUF_SIZE);
audio_set_track_buffer_event(tagtree_buffer_event); audio_set_track_buffer_event(tagtree_buffer_event);
audio_set_track_unbuffer_event(tagtree_unbuffer_event); audio_set_track_unbuffer_event(tagtree_unbuffer_event);