summaryrefslogtreecommitdiff
path: root/apps/action.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2012-08-14 12:12:15 +1000
committerJonathan Gordon <rockbox@jdgordon.info>2012-08-14 12:12:15 +1000
commit70eb3e6a563758a80ec894c009ca51bd79945043 (patch)
tree88f291ce485f961cb7705dfa597ec62e74884a21 /apps/action.c
parentbd6e6ed40385c5d5f357a39909ae6a5db60f7ce9 (diff)
downloadrockbox-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/action.c')
-rw-r--r--apps/action.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/apps/action.c b/apps/action.c
index 3c130e3e29..5ebcbf771b 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -232,13 +232,7 @@ static int get_action_worker(int context, int timeout,
232 /* Data from sys events can be pulled with button_get_data 232 /* Data from sys events can be pulled with button_get_data
233 * multimedia button presses don't go through the action system */ 233 * multimedia button presses don't go through the action system */
234 if (button == BUTTON_NONE || button & (SYS_EVENT|BUTTON_MULTIMEDIA)) 234 if (button == BUTTON_NONE || button & (SYS_EVENT|BUTTON_MULTIMEDIA))
235 {
236 /* no button pressed so no point in waiting for release */
237 if (button == BUTTON_NONE)
238 wait_for_release = false;
239 return button; 235 return button;
240 }
241
242 /* the special redraw button should result in a screen refresh */ 236 /* the special redraw button should result in a screen refresh */
243 if (button == BUTTON_REDRAW) 237 if (button == BUTTON_REDRAW)
244 return ACTION_REDRAW; 238 return ACTION_REDRAW;