From: Felix Domke Date: Thu, 15 Jun 2006 17:35:32 +0000 (+0000) Subject: support optional return code X-Git-Tag: 2.6.0~3319 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/4b131e5355ab67658462b2aa4c5deca0d9188827 support optional return code --- diff --git a/lib/python/Components/ActionMap.py b/lib/python/Components/ActionMap.py index ee3d31db..d2e908e6 100644 --- a/lib/python/Components/ActionMap.py +++ b/lib/python/Components/ActionMap.py @@ -44,7 +44,9 @@ class ActionMap: def action(self, context, action): print " ".join(("action -> ", context, action)) if self.actions.has_key(action): - self.actions[action]() + res = self.actions[action]() + if res is not None: + return res return 1 else: print "unknown action %s/%s! typo in keymap?" % (context, action) @@ -57,7 +59,9 @@ class NumberActionMap(ActionMap): def action(self, contexts, action): numbers = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"] if (action in numbers and self.actions.has_key(action)): - self.actions[action](int(action)) + res = self.actions[action](int(action)) + if res is not None: + return res return 1 else: return ActionMap.action(self, contexts, action)