summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2009-06-11 20:36:02 +0000
committerFrank Gevaerts <frank@gevaerts.be>2009-06-11 20:36:02 +0000
commitc61076e51961518f5da52b6041079a0635e057fc (patch)
tree726bbdc80b3ef5ca893e298261c89dea3a1c9fbc
parent864a4787b02a2db6edd656129c24168666d12bef (diff)
downloadrockbox-c61076e51961518f5da52b6041079a0635e057fc.tar.gz
rockbox-c61076e51961518f5da52b6041079a0635e057fc.tar.bz2
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
-rw-r--r--apps/action.c5
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 @@
#include "splash.h"
#include "settings.h"
#include "pcmbuf.h"
+#include "misc.h"
static int last_button = BUTTON_NONE|BUTTON_REL; /* allow the ipod wheel to
work on startup */
@@ -261,6 +262,10 @@ bool action_userabort(int timeout)
{
int action = get_action_worker(CONTEXT_STD,timeout,NULL);
bool ret = (action == ACTION_STD_CANCEL);
+ if(!ret)
+ {
+ default_event_handler(action);
+ }
return ret;
}