diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2009-06-11 20:36:02 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2009-06-11 20:36:02 +0000 |
commit | c61076e51961518f5da52b6041079a0635e057fc (patch) | |
tree | 726bbdc80b3ef5ca893e298261c89dea3a1c9fbc /apps | |
parent | 864a4787b02a2db6edd656129c24168666d12bef (diff) | |
download | rockbox-c61076e51961518f5da52b6041079a0635e057fc.tar.gz rockbox-c61076e51961518f5da52b6041079a0635e057fc.zip |
call default_event_handler() in action_userabort() for events other than ACTION_STD_CANCEL, so things like usb events work properly. This partly fixes FS#9957 (the database screen now works, WPS and recording don't)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21250 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/action.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/action.c b/apps/action.c index 5810003744..f493296a03 100644 --- a/apps/action.c +++ b/apps/action.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include "splash.h" | 33 | #include "splash.h" |
34 | #include "settings.h" | 34 | #include "settings.h" |
35 | #include "pcmbuf.h" | 35 | #include "pcmbuf.h" |
36 | #include "misc.h" | ||
36 | 37 | ||
37 | static int last_button = BUTTON_NONE|BUTTON_REL; /* allow the ipod wheel to | 38 | static int last_button = BUTTON_NONE|BUTTON_REL; /* allow the ipod wheel to |
38 | work on startup */ | 39 | work on startup */ |
@@ -261,6 +262,10 @@ bool action_userabort(int timeout) | |||
261 | { | 262 | { |
262 | int action = get_action_worker(CONTEXT_STD,timeout,NULL); | 263 | int action = get_action_worker(CONTEXT_STD,timeout,NULL); |
263 | bool ret = (action == ACTION_STD_CANCEL); | 264 | bool ret = (action == ACTION_STD_CANCEL); |
265 | if(!ret) | ||
266 | { | ||
267 | default_event_handler(action); | ||
268 | } | ||
264 | return ret; | 269 | return ret; |
265 | } | 270 | } |
266 | 271 | ||