diff options
| author | Steve Bavin <pondlife@pondlife.me> | 2007-06-11 08:28:38 +0000 |
|---|---|---|
| committer | Steve Bavin <pondlife@pondlife.me> | 2007-06-11 08:28:38 +0000 |
| commit | 24d9f59c784ab07241b51851a2683ea1c90e89e2 (patch) | |
| tree | 5a9140a80bd279870a5e6d6aa4e6f0d9797eb24f /apps/settings.c | |
| parent | 0fba85fe9ee8775aed331e4a9f60d91ac78ade9c (diff) | |
| download | rockbox-24d9f59c784ab07241b51851a2683ea1c90e89e2.tar.gz rockbox-24d9f59c784ab07241b51851a2683ea1c90e89e2.zip | |
When recording, disable voice menus without actually modifying user settings. Patch FS#7272, fixes bug FS #6163
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13615 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
| -rw-r--r-- | apps/settings.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/apps/settings.c b/apps/settings.c index 2bae9ae1b1..09c90af066 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -952,7 +952,7 @@ const struct settings_list* find_setting(void* variable, int *id) void talk_setting(void *global_settings_variable) { const struct settings_list *setting; - if (global_settings.talk_menu == 0) + if (!talk_menus_enabled()) return; setting = find_setting(global_settings_variable, NULL); if (setting == NULL) @@ -1043,7 +1043,7 @@ bool set_bool_options(const char* string, bool* variable, static void talk_unit(int unit, int value, long (*get_talk_id)(int value)) { - if (global_settings.talk_menu) + if (talk_menus_enabled()) { if (get_talk_id) { @@ -1121,11 +1121,12 @@ static bool do_set_setting(const unsigned char* string, void *variable, gui_synclist_limit_scroll(&lists,true); gui_synclist_select_item(&lists, selected); - if (global_settings.talk_menu) + if (talk_menus_enabled()) { if (cb_data->type == INT && !cb_data->options) talk_unit(cb_data->voice_unit, *(int*)variable, cb_data->get_talk_id); - else talk_id(cb_data->options[selected].voice_id, false); + else + talk_id(cb_data->options[selected].voice_id, false); } gui_synclist_draw(&lists); @@ -1139,7 +1140,7 @@ static bool do_set_setting(const unsigned char* string, void *variable, if (gui_synclist_do_button(&lists,action, allow_wrap?LIST_WRAP_UNLESS_HELD:LIST_WRAP_OFF)) { - if (global_settings.talk_menu) + if (talk_menus_enabled()) { int value; if (cb_data->type == INT && !cb_data->options) |