mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-14 10:37:38 -04:00
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
This commit is contained in:
parent
864a4787b0
commit
c61076e519
1 changed files with 5 additions and 0 deletions
|
@ -33,6 +33,7 @@
|
||||||
#include "splash.h"
|
#include "splash.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
#include "pcmbuf.h"
|
#include "pcmbuf.h"
|
||||||
|
#include "misc.h"
|
||||||
|
|
||||||
static int last_button = BUTTON_NONE|BUTTON_REL; /* allow the ipod wheel to
|
static int last_button = BUTTON_NONE|BUTTON_REL; /* allow the ipod wheel to
|
||||||
work on startup */
|
work on startup */
|
||||||
|
@ -261,6 +262,10 @@ bool action_userabort(int timeout)
|
||||||
{
|
{
|
||||||
int action = get_action_worker(CONTEXT_STD,timeout,NULL);
|
int action = get_action_worker(CONTEXT_STD,timeout,NULL);
|
||||||
bool ret = (action == ACTION_STD_CANCEL);
|
bool ret = (action == ACTION_STD_CANCEL);
|
||||||
|
if(!ret)
|
||||||
|
{
|
||||||
|
default_event_handler(action);
|
||||||
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue