From fe2b376060cfedb2d53b6025fcdef9cdd8604733 Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Mon, 23 Jul 2007 05:40:45 +0000
Subject: Fix the text for settings which have a different title than what is
 shown in the menu (i.e scroll options)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13962 a1c6a512-1295-4272-9138-f99709370657
---
 apps/menu.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'apps/menu.c')

diff --git a/apps/menu.c b/apps/menu.c
index a9bc0d4..60f2424 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -253,15 +253,19 @@ static void talk_menu_item(const struct menu_item_ex *menu,
     }
 }
 #define MAX_OPTIONS 32
-/* returns true if the menu needs to be redrwan */
 bool do_setting_from_menu(const struct menu_item_ex *temp)
 {
     int setting_id;
     const struct settings_list *setting = find_setting(
                                                temp->variable,
                                                &setting_id);
+    char *title;
+    if ((temp->flags&MENU_TYPE_MASK) == MT_SETTING_W_TEXT)
+        title = temp->callback_and_desc->desc;
+    else
+        title = ID2P(setting->lang_id);
     option_screen((struct settings_list *)setting, 
-                   setting->flags&F_TEMPVAR);
+                  setting->flags&F_TEMPVAR, title);
     return false;
 }
 
-- 
cgit v1.1