From ec7ca33a0c8073d12738f958dbfdff5fd39efc32 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Thu, 5 Apr 2007 02:50:43 +0000 Subject: [PATCH] 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) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13027 a1c6a512-1295-4272-9138-f99709370657 --- apps/bookmark.c | 5 +++++ apps/root_menu.c | 2 +- apps/root_menu.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/bookmark.c b/apps/bookmark.c index a86e2a6504..b5c0e4a148 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c @@ -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) { diff --git a/apps/root_menu.c b/apps/root_menu.c index c9abd662db..1fc330941c 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c @@ -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 ) diff --git a/apps/root_menu.h b/apps/root_menu.h index 5e411a5eae..ee82357103 100644 --- a/apps/root_menu.h +++ b/apps/root_menu.h @@ -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,