Fix execute plugin only executing last event (#1306)

2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4b119be19..cb9e71516 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 ==== ConsoleUI ====
 	* #1307: Fix not being able to add torrents
 
+==== Execute ====
+	* #1306: Fix always executing last event
+
 === Deluge 1.3.0-rc1 (08 May 2010) ===
 ==== Core ====
 	* Implement #1063 option to delete torrent file copy on torrent removal - patch from Ghent
diff --git a/deluge/plugins/execute/execute/core.py b/deluge/plugins/execute/execute/core.py
index 57fd13f46..4c5e66005 100644
--- a/deluge/plugins/execute/execute/core.py
+++ b/deluge/plugins/execute/execute/core.py
@@ -84,8 +84,11 @@ class Core(CorePluginBase):
             if event in self.registered_events:
                 continue
 
-            def event_handler(torrent_id):
-                self.execute_commands(torrent_id, command[EXECUTE_EVENT])
+            def create_event_handler(event):
+                def event_handler(torrent_id):
+                    self.execute_commands(torrent_id, event)
+                return event_handler
+            event_handler = create_event_handler(event)
             event_manager.register_event_handler(EVENT_MAP[event], event_handler)
             self.registered_events[event] = event_handler
 
@@ -102,7 +105,7 @@ class Core(CorePluginBase):
         else:
             save_path = info["save_path"]
 
-        log.debug("[execute] Running commands for %s", EXECUTE_EVENT)
+        log.debug("[execute] Running commands for %s", event)
 
         # Go through and execute all the commands
         for command in self.config["commands"]: