From 71e3f6c07727ec6784cf7f9cf01b5e2888b4522c Mon Sep 17 00:00:00 2001
From: William Wilgus <me.theuser@yahoo.com>
Date: Mon, 11 Dec 2017 02:24:42 +0100
Subject: [PATCH] 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
---
 apps/action.c | 15 +++++----------
 1 file 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)
         }
 #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;
 }
 
 /*******************************************************