summaryrefslogtreecommitdiffstats
path: root/apps/action.c
diff options
context:
space:
mode:
authorAndrew Mahone <andrew.mahone@gmail.com>2009-05-31 17:47:56 +0000
committerAndrew Mahone <andrew.mahone@gmail.com>2009-05-31 17:47:56 +0000
commit29d7db4a46a773793d83cca9583f6aa403f5fa3d (patch)
treef094238dc57392d0574bf1922236e4456b2edd5c /apps/action.c
parentc69331ef32171966b19f4348c72539d4c6a149ba (diff)
downloadrockbox-29d7db4a46a773793d83cca9583f6aa403f5fa3d.tar.gz
rockbox-29d7db4a46a773793d83cca9583f6aa403f5fa3d.tar.bz2
rockbox-29d7db4a46a773793d83cca9583f6aa403f5fa3d.zip
Replace use of CONTEXT_CUSTOM by get_custom_action with new CONTEXT_PLUGIN, to prevent conflicts with core contexts using CONTEXT_CUSTOM, and use CONTEXT_TREE as the base context for PictureFlow's custom contexts.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21149 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/action.c')
-rw-r--r--apps/action.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/action.c b/apps/action.c
index 21198889d2..5810003744 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -197,7 +197,7 @@ static int get_action_worker(int context, int timeout,
if (button & BUTTON_REMOTE)
context |= CONTEXT_REMOTE;
#endif
- if ((context & CONTEXT_CUSTOM) && get_context_map)
+ if ((context & CONTEXT_PLUGIN) && get_context_map)
items = get_context_map(context);
else
items = get_context_mapping(context);