Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix error with action subsystem and custom context mapping

Browse source 
I removed the mechanism to fall through to internally mapped contexts
after plugin contexts were exhausted

Change-Id: Id287248184fd67cb2a2242475296247ac86af807
This commit is contained in:
William Wilgus 2017-12-11 02:24:42 +01:00 committed by Franklin Wei
parent 786fbbfa20
commit 71e3f6c077
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/action.c
View file

@ -591,7 +591,10 @@ static inline void action_code_lookup(action_last_t *last, action_cur_t *cur)
}
#endif
cur->items = cur->get_context_map(context);
if ((context & CONTEXT_PLUGIN) && cur->get_context_map)
cur->items = cur->get_context_map(context);
else
cur->items = get_context_mapping(context);
if (cur->items != NULL)
{
@ -854,15 +857,7 @@ static void init_act_cur(action_cur_t *cur,
cur->is_prebutton = false;
cur->items = NULL;
cur->timeout = timeout;
if (get_context_map == NULL)/* standard mapping */
{
cur->get_context_map = get_context_mapping;
}
else /* user defined button mapping*/
{
cur->get_context_map = get_context_map;
}
cur->get_context_map = get_context_map;
}
/*******************************************************