diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-04-05 02:50:43 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-04-05 02:50:43 +0000 |
commit | ec7ca33a0c8073d12738f958dbfdff5fd39efc32 (patch) | |
tree | 06b7a7c008ec739487aab78958f90b35fd0d17e2 /apps | |
parent | 29e18caacff0fe07736c6652ec75267fce6c9aff (diff) | |
download | rockbox-ec7ca33a0c8073d12738f958dbfdff5fd39efc32.tar.gz rockbox-ec7ca33a0c8073d12738f958dbfdff5fd39efc32.zip |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/bookmark.c | 5 | ||||
-rw-r--r-- | apps/root_menu.c | 2 | ||||
-rw-r--r-- | 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) | |||
501 | #endif | 501 | #endif |
502 | 502 | ||
503 | bookmark_count = get_bookmark_count(bookmark_file_name); | 503 | bookmark_count = get_bookmark_count(bookmark_file_name); |
504 | if (bookmark_count < 1) /* error opening file, or empty file */ | ||
505 | { | ||
506 | gui_syncsplash(HZ, str(LANG_BOOKMARK_LOAD_EMPTY)); | ||
507 | return NULL; | ||
508 | } | ||
504 | action_signalscreenchange(); | 509 | action_signalscreenchange(); |
505 | while(true) | 510 | while(true) |
506 | { | 511 | { |
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) | |||
457 | ) | 457 | ) |
458 | previous_browser = next_screen; | 458 | previous_browser = next_screen; |
459 | if (next_screen == GO_TO_WPS | 459 | if (next_screen == GO_TO_WPS |
460 | #ifdef CONFIG_TUNER | 460 | #if CONFIG_TUNER |
461 | || next_screen == GO_TO_FM | 461 | || next_screen == GO_TO_FM |
462 | #endif | 462 | #endif |
463 | ) | 463 | ) |
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 { | |||
38 | #ifdef HAVE_RECORDING | 38 | #ifdef HAVE_RECORDING |
39 | GO_TO_RECSCREEN, | 39 | GO_TO_RECSCREEN, |
40 | #endif | 40 | #endif |
41 | #ifdef CONFIG_TUNER | 41 | #if CONFIG_TUNER |
42 | GO_TO_FM, | 42 | GO_TO_FM, |
43 | #endif | 43 | #endif |
44 | GO_TO_RECENTBMARKS, | 44 | GO_TO_RECENTBMARKS, |