From b35c1d8d35bec9998ac4d691624de24b51d2bc4e Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Thu, 15 Mar 2007 04:42:10 +0000
Subject: 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
---
 apps/menu.c                | 4 ++--
 apps/menus/playlist_menu.c | 2 +-
 apps/menus/sound_menu.c    | 2 +-
 apps/recorder/radio.c      | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'apps')

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)
 
 int main_menu(void)
 {
-    return do_menu(NULL, 0);
+    return do_menu(NULL, 0) == MENU_ATTACHED_USB;
 }
 
 /* wrappers for the old menu system to work with the new system */
@@ -706,7 +706,7 @@ int menu_show(int m)
                  MENU_ITEM_COUNT(menus[m].count);
     menu.value = m;
     menu.menu_get_name_and_icon = &menu_info;
-    return do_menu(&menu, &menus[m].current_selection);
+    return do_menu(&menu, &menus[m].current_selection) == MENU_ATTACHED_USB;
 }
 
 
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,
 
 bool playlist_menu(void)
 {
-    return do_menu(&playlist_options, NULL);
+    return do_menu(&playlist_options, NULL) == MENU_ATTACHED_USB;
 }
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,
 
 bool sound_menu(void)
 {
-    return do_menu(&sound_settings, 0);
+    return do_menu(&sound_settings, 0) == MENU_ATTACHED_USB;
 }
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),
 static int fm_recording_settings(void)
 {
     bool ret = recording_menu(true);
-
 #if CONFIG_CODEC != SWCODEC
     if (!ret)
     {
@@ -1503,7 +1502,7 @@ MAKE_MENU(radio_menu_items, ID2P(LANG_FM_MENU), NULL,
 /* main menu of the radio screen */
 static bool radio_menu(void)
 {
-    return (bool)do_menu(&radio_menu_items, NULL);
+    return do_menu(&radio_menu_items, NULL) == MENU_ATTACHED_USB;
 }
 
 #endif
-- 
cgit v1.2.3