diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/list.c | 9 | ||||
-rw-r--r-- | apps/menus/main_menu.c | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/apps/gui/list.c b/apps/gui/list.c index feee1ec7a7..e7de12c4a0 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c | |||
@@ -1266,15 +1266,14 @@ bool simplelist_show_list(struct simplelist_info *info) | |||
1266 | 1266 | ||
1267 | gui_synclist_select_item(&lists, info->start_selection); | 1267 | gui_synclist_select_item(&lists, info->start_selection); |
1268 | 1268 | ||
1269 | if (info->get_talk) | ||
1270 | info->get_talk(gui_synclist_get_sel_pos(&lists), info->callback_data); | ||
1271 | gui_synclist_draw(&lists); | 1269 | gui_synclist_draw(&lists); |
1270 | gui_synclist_speak_item(&lists); | ||
1272 | 1271 | ||
1273 | while(1) | 1272 | while(1) |
1274 | { | 1273 | { |
1275 | gui_syncstatusbar_draw(&statusbars, true); | 1274 | gui_syncstatusbar_draw(&statusbars, true); |
1276 | action = get_action(CONTEXT_STD, info->timeout); | 1275 | if (list_do_action(CONTEXT_STD, info->timeout, |
1277 | if (gui_synclist_do_button(&lists, &action, LIST_WRAP_UNLESS_HELD)) | 1276 | &lists, &action, LIST_WRAP_UNLESS_HELD)) |
1278 | continue; | 1277 | continue; |
1279 | if (info->action_callback) | 1278 | if (info->action_callback) |
1280 | { | 1279 | { |
@@ -1289,12 +1288,14 @@ bool simplelist_show_list(struct simplelist_info *info) | |||
1289 | if (info->get_name == NULL) | 1288 | if (info->get_name == NULL) |
1290 | gui_synclist_set_nb_items(&lists, simplelist_line_count*info->selection_size); | 1289 | gui_synclist_set_nb_items(&lists, simplelist_line_count*info->selection_size); |
1291 | gui_synclist_draw(&lists); | 1290 | gui_synclist_draw(&lists); |
1291 | gui_synclist_speak_item(&lists); | ||
1292 | old_line_count = simplelist_line_count; | 1292 | old_line_count = simplelist_line_count; |
1293 | } | 1293 | } |
1294 | else if(default_event_handler(action) == SYS_USB_CONNECTED) | 1294 | else if(default_event_handler(action) == SYS_USB_CONNECTED) |
1295 | return true; | 1295 | return true; |
1296 | 1296 | ||
1297 | } | 1297 | } |
1298 | talk_shutup(); | ||
1298 | return false; | 1299 | return false; |
1299 | } | 1300 | } |
1300 | 1301 | ||
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 601ecc95b6..e94074217a 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -303,7 +303,8 @@ static bool show_info(void) | |||
303 | simplelist_info_init(&info, str(LANG_ROCKBOX_INFO), 6, (void*)&data); | 303 | simplelist_info_init(&info, str(LANG_ROCKBOX_INFO), 6, (void*)&data); |
304 | info.hide_selection = !global_settings.talk_menu; | 304 | info.hide_selection = !global_settings.talk_menu; |
305 | info.get_name = info_getname; | 305 | info.get_name = info_getname; |
306 | info.get_talk = info_speak_item; | 306 | if(global_settings.talk_menu) |
307 | info.get_talk = info_speak_item; | ||
307 | info.action_callback = info_action_callback; | 308 | info.action_callback = info_action_callback; |
308 | return simplelist_show_list(&info); | 309 | return simplelist_show_list(&info); |
309 | } | 310 | } |