fixed and improved last pull request

1 files changed, 3 insertions, 7 deletions

diff --git a/pyload/interaction/EventManager.py b/pyload/interaction/EventManager.py
index 8cc1e81d2..ce56b6463 100644
--- a/pyload/interaction/EventManager.py
+++ b/pyload/interaction/EventManager.py
@@ -57,13 +57,9 @@ class EventManager:
 
     def dispatchEvent(self, event, *args, **kwargs):
         """dispatches event with args"""
-        for f in self.events["event"]:
-            try:
-                f(event, *args, **kwargs)
-            except Exception, e:
-                self.log.warning("Error calling event handler %s: %s, %s, %s"
-                                 % ("event", f, args, str(e)))
-                self.core.print_exc()
+        # dispatch the meta event
+        if event != "event":
+            self.dispatchEvent("event", *(event,) + args, **kwargs)
 
         if event in self.events:
             for f in self.events[event]: