summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/gui/quickscreen.c30
1 files changed, 17 insertions, 13 deletions
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c
index 36f3d82..a2770a3 100644
--- a/apps/gui/quickscreen.c
+++ b/apps/gui/quickscreen.c
@@ -258,8 +258,9 @@ static bool gui_quickscreen_do_button(struct gui_quickscreen * qs, int button)
return false;
}
option_select_next_val((struct settings_list *)qs->items[item], false, true);
- option_talk_value((struct settings_list *)qs->items[item],
- option_value((struct settings_list *)qs->items[item]), false);
+ if (global_settings.talk_menu)
+ option_talk_value((struct settings_list *)qs->items[item],
+ option_value((struct settings_list *)qs->items[item]), false);
return true;
}
@@ -282,17 +283,20 @@ bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter)
quickscreen_fix_viewports(qs, &screens[i], &vp[i]);
gui_quickscreen_draw(qs, &screens[i], &vp[i]);
}
- talk_id(qs->items[QUICKSCREEN_LEFT]->lang_id, false);
- option_talk_value(qs->items[QUICKSCREEN_LEFT],
- option_value(qs->items[QUICKSCREEN_LEFT]), true);
-
- talk_id(qs->items[QUICKSCREEN_RIGHT]->lang_id, true);
- option_talk_value(qs->items[QUICKSCREEN_RIGHT],
- option_value(qs->items[QUICKSCREEN_RIGHT]), true);
-
- talk_id(qs->items[QUICKSCREEN_BOTTOM]->lang_id, true);
- option_talk_value(qs->items[QUICKSCREEN_BOTTOM],
- option_value(qs->items[QUICKSCREEN_BOTTOM]), true);
+ if (global_settings.talk_menu)
+ {
+ talk_id(qs->items[QUICKSCREEN_LEFT]->lang_id, false);
+ option_talk_value(qs->items[QUICKSCREEN_LEFT],
+ option_value(qs->items[QUICKSCREEN_LEFT]), true);
+
+ talk_id(qs->items[QUICKSCREEN_RIGHT]->lang_id, true);
+ option_talk_value(qs->items[QUICKSCREEN_RIGHT],
+ option_value(qs->items[QUICKSCREEN_RIGHT]), true);
+
+ talk_id(qs->items[QUICKSCREEN_BOTTOM]->lang_id, true);
+ option_talk_value(qs->items[QUICKSCREEN_BOTTOM],
+ option_value(qs->items[QUICKSCREEN_BOTTOM]), true);
+ }
while (true) {
button = get_action(CONTEXT_QUICKSCREEN,HZ/5);
if(default_event_handler(button) == SYS_USB_CONNECTED)