diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2012-08-14 12:12:15 +1000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2012-08-14 12:12:15 +1000 |
| commit | 70eb3e6a563758a80ec894c009ca51bd79945043 (patch) | |
| tree | 88f291ce485f961cb7705dfa597ec62e74884a21 /apps/gui/yesno.c | |
| parent | bd6e6ed40385c5d5f357a39909ae6a5db60f7ce9 (diff) | |
| download | rockbox-70eb3e6a563758a80ec894c009ca51bd79945043.tar.gz rockbox-70eb3e6a563758a80ec894c009ca51bd79945043.zip | |
Revert "fix erroneous button read in yesno screen and missed buttons in action.c."
This reverts commit 15775c8badac65ad9d7477a1706c019703c15b47.
Diffstat (limited to 'apps/gui/yesno.c')
| -rw-r--r-- | apps/gui/yesno.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c index dc0465184d..a2abae33ae 100644 --- a/apps/gui/yesno.c +++ b/apps/gui/yesno.c @@ -169,10 +169,9 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message, screens[i].stop_scroll(); gui_yesno_draw(&(yn[i])); } - /* make sure to eat any extranous keypresses */ - action_wait_for_release(); - + while (get_action(CONTEXT_STD+99, TIMEOUT_NOBLOCK)) + action_wait_for_release(); while (result==-1) { /* Repeat the question every 5secs (more or less) */ @@ -206,7 +205,6 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message, result=YESNO_YES; break; case ACTION_NONE: - case ACTION_UNKNOWN: case SYS_CHARGER_DISCONNECTED: case SYS_BATTERY_UPDATE: /* ignore some SYS events that can happen */ @@ -235,7 +233,6 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message, screens[i].scroll_stop(yn[i].vp); viewportmanager_theme_undo(i, true); } - return(result); } |