Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the root menu for any targets without a radio (we are using #if not #ifdef for CONFIG_TUNER). Fixes the bookmark issue in FS#6965)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13027 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-04-05 02:50:43 +00:00
parent 29e18caacf
commit ec7ca33a0c
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/bookmark.c
View file

@ -501,6 +501,11 @@ static char* select_bookmark(const char* bookmark_file_name)
#endif
bookmark_count = get_bookmark_count(bookmark_file_name);
if (bookmark_count < 1) /* error opening file, or empty file */
{
gui_syncsplash(HZ, str(LANG_BOOKMARK_LOAD_EMPTY));
return NULL;
}
action_signalscreenchange();
while(true)
{

2
apps/root_menu.c
View file

@ -457,7 +457,7 @@ void root_menu(void)
)
previous_browser = next_screen;
if (next_screen == GO_TO_WPS
#ifdef CONFIG_TUNER
#if CONFIG_TUNER
|| next_screen == GO_TO_FM
#endif
)

2
apps/root_menu.h
View file

@ -38,7 +38,7 @@ enum {
#ifdef HAVE_RECORDING
GO_TO_RECSCREEN,
#endif
#ifdef CONFIG_TUNER
#if CONFIG_TUNER
GO_TO_FM,
#endif
GO_TO_RECENTBMARKS,