diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-15 04:42:10 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-15 04:42:10 +0000 |
commit | b35c1d8d35bec9998ac4d691624de24b51d2bc4e (patch) | |
tree | eaa490a80283a65e7c50d5cb28bed2e563bbca0e /apps | |
parent | 15c5d26de6a90a211de4262e055af212575aea6d (diff) | |
download | rockbox-b35c1d8d35bec9998ac4d691624de24b51d2bc4e.tar.gz rockbox-b35c1d8d35bec9998ac4d691624de24b51d2bc4e.zip |
Change anywhere where do_menu()'s return value was checked and expected
a bool to appear the same as the old API. Possibly fixes some bugs, but
doubtful.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12772 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/menu.c | 4 | ||||
-rw-r--r-- | apps/menus/playlist_menu.c | 2 | ||||
-rw-r--r-- | apps/menus/sound_menu.c | 2 | ||||
-rw-r--r-- | apps/recorder/radio.c | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/apps/menu.c b/apps/menu.c index 2c21c223f7..dbf295d9ac 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -603,7 +603,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected) | |||
603 | 603 | ||
604 | int main_menu(void) | 604 | int main_menu(void) |
605 | { | 605 | { |
606 | return do_menu(NULL, 0); | 606 | return do_menu(NULL, 0) == MENU_ATTACHED_USB; |
607 | } | 607 | } |
608 | 608 | ||
609 | /* wrappers for the old menu system to work with the new system */ | 609 | /* wrappers for the old menu system to work with the new system */ |
@@ -706,7 +706,7 @@ int menu_show(int m) | |||
706 | MENU_ITEM_COUNT(menus[m].count); | 706 | MENU_ITEM_COUNT(menus[m].count); |
707 | menu.value = m; | 707 | menu.value = m; |
708 | menu.menu_get_name_and_icon = &menu_info; | 708 | menu.menu_get_name_and_icon = &menu_info; |
709 | return do_menu(&menu, &menus[m].current_selection); | 709 | return do_menu(&menu, &menus[m].current_selection) == MENU_ATTACHED_USB; |
710 | } | 710 | } |
711 | 711 | ||
712 | 712 | ||
diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c index 8cf4604b0f..d4b311154a 100644 --- a/apps/menus/playlist_menu.c +++ b/apps/menus/playlist_menu.c | |||
@@ -82,5 +82,5 @@ MAKE_MENU(playlist_options, ID2P(LANG_PLAYLIST_MENU), NULL, | |||
82 | 82 | ||
83 | bool playlist_menu(void) | 83 | bool playlist_menu(void) |
84 | { | 84 | { |
85 | return do_menu(&playlist_options, NULL); | 85 | return do_menu(&playlist_options, NULL) == MENU_ATTACHED_USB; |
86 | } | 86 | } |
diff --git a/apps/menus/sound_menu.c b/apps/menus/sound_menu.c index 4efc36bdf2..92422ae3e3 100644 --- a/apps/menus/sound_menu.c +++ b/apps/menus/sound_menu.c | |||
@@ -113,5 +113,5 @@ MAKE_MENU(sound_settings, ID2P(LANG_SOUND_SETTINGS), NULL, Icon_Audio, | |||
113 | 113 | ||
114 | bool sound_menu(void) | 114 | bool sound_menu(void) |
115 | { | 115 | { |
116 | return do_menu(&sound_settings, 0); | 116 | return do_menu(&sound_settings, 0) == MENU_ATTACHED_USB; |
117 | } | 117 | } |
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 72840bb744..7258840dbf 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -1442,7 +1442,6 @@ MENUITEM_FUNCTION(recscreen_item, ID2P(LANG_RECORDING_MENU), | |||
1442 | static int fm_recording_settings(void) | 1442 | static int fm_recording_settings(void) |
1443 | { | 1443 | { |
1444 | bool ret = recording_menu(true); | 1444 | bool ret = recording_menu(true); |
1445 | |||
1446 | #if CONFIG_CODEC != SWCODEC | 1445 | #if CONFIG_CODEC != SWCODEC |
1447 | if (!ret) | 1446 | if (!ret) |
1448 | { | 1447 | { |
@@ -1503,7 +1502,7 @@ MAKE_MENU(radio_menu_items, ID2P(LANG_FM_MENU), NULL, | |||
1503 | /* main menu of the radio screen */ | 1502 | /* main menu of the radio screen */ |
1504 | static bool radio_menu(void) | 1503 | static bool radio_menu(void) |
1505 | { | 1504 | { |
1506 | return (bool)do_menu(&radio_menu_items, NULL); | 1505 | return do_menu(&radio_menu_items, NULL) == MENU_ATTACHED_USB; |
1507 | } | 1506 | } |
1508 | 1507 | ||
1509 | #endif | 1508 | #endif |