[gnue] r9389 - trunk/gnue-common/src/logic

[reinhard]

Author: reinhard
Date: 2007-02-21 07:42:41 -0600 (Wed, 21 Feb 2007)
New Revision: 9389

Modified:
   trunk/gnue-common/src/logic/GTrigger.py
Log:
Fixed calling of several trigger functions bound to the same event.


Modified: trunk/gnue-common/src/logic/GTrigger.py
===================================================================
--- trunk/gnue-common/src/logic/GTrigger.py     2007-02-20 18:52:02 UTC (rev 
9388)
+++ trunk/gnue-common/src/logic/GTrigger.py     2007-02-21 13:42:41 UTC (rev 
9389)
@@ -224,13 +224,18 @@
             raise InvalidTriggerFiredError, (key, self)
 
         assert gDebug (9, 'Trigger %s on %s' % (key, repr(self)))
+        result = None
         if self.__triggers.has_key(key):
             for function in self.__triggers[key]:
+                print function
                 try:
-                    return function(self = self.get_namespace_object())
+                    new_result = function(self = self.get_namespace_object())
+                    if new_result is not None:
+                        result = new_result
                 except language.AbortRequest:
                     if not ignoreAbort:
                         raise
+        return result
 
 
 # =============================================================================