diff options
author | William Wilgus <me.theuser@yahoo.com> | 2017-12-11 02:24:42 +0100 |
---|---|---|
committer | Franklin Wei <me@fwei.tk> | 2017-12-18 22:23:18 +0100 |
commit | 71e3f6c07727ec6784cf7f9cf01b5e2888b4522c (patch) | |
tree | 020ffa449ee762622d466e014877a5cf51fdabb3 /apps | |
parent | 786fbbfa20e106f9d19607d841e74116ee2b608a (diff) | |
download | rockbox-71e3f6c07727ec6784cf7f9cf01b5e2888b4522c.tar.gz rockbox-71e3f6c07727ec6784cf7f9cf01b5e2888b4522c.zip |
Fix error with action subsystem and custom context mapping
I removed the mechanism to fall through to internally mapped contexts
after plugin contexts were exhausted
Change-Id: Id287248184fd67cb2a2242475296247ac86af807
Diffstat (limited to 'apps')
-rw-r--r-- | apps/action.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/apps/action.c b/apps/action.c index 9b559cc0c2..9b665d22a9 100644 --- a/apps/action.c +++ b/apps/action.c | |||
@@ -591,7 +591,10 @@ static inline void action_code_lookup(action_last_t *last, action_cur_t *cur) | |||
591 | } | 591 | } |
592 | #endif | 592 | #endif |
593 | 593 | ||
594 | cur->items = cur->get_context_map(context); | 594 | if ((context & CONTEXT_PLUGIN) && cur->get_context_map) |
595 | cur->items = cur->get_context_map(context); | ||
596 | else | ||
597 | cur->items = get_context_mapping(context); | ||
595 | 598 | ||
596 | if (cur->items != NULL) | 599 | if (cur->items != NULL) |
597 | { | 600 | { |
@@ -854,15 +857,7 @@ static void init_act_cur(action_cur_t *cur, | |||
854 | cur->is_prebutton = false; | 857 | cur->is_prebutton = false; |
855 | cur->items = NULL; | 858 | cur->items = NULL; |
856 | cur->timeout = timeout; | 859 | cur->timeout = timeout; |
857 | 860 | cur->get_context_map = get_context_map; | |
858 | if (get_context_map == NULL)/* standard mapping */ | ||
859 | { | ||
860 | cur->get_context_map = get_context_mapping; | ||
861 | } | ||
862 | else /* user defined button mapping*/ | ||
863 | { | ||
864 | cur->get_context_map = get_context_map; | ||
865 | } | ||
866 | } | 861 | } |
867 | 862 | ||
868 | /******************************************************* | 863 | /******************************************************* |