fix a bug in the execute plugin when move_completed is used the incorrect path was passed in

2 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1f80be898..ef1fae503 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
 ==== Label ====
 	* Fix #1085 only use ints for specific options to prevent unhandled exception
 
+==== Execute ====
+	* Use the move_completed path if it is different to the save path in the completed event.
+
 === Deluge 1.2.0_rc4 (24 November 2009) ===
 ==== Core ====
 	* Fix deleting old .fastresume files with fresh configs
diff --git a/deluge/plugins/execute/execute/core.py b/deluge/plugins/execute/execute/core.py
index ef4c6f6f2..96565207d 100644
--- a/deluge/plugins/execute/execute/core.py
+++ b/deluge/plugins/execute/execute/core.py
@@ -78,9 +78,14 @@ class Core(CorePluginBase):
 
     def execute_commands(self, torrent_id, event):
         torrent = component.get("TorrentManager").torrents[torrent_id]
-        info = torrent.get_status(["name", "save_path"])
+        info = torrent.get_status(["name", "save_path",
+            "move_on_completed_path"])
+
         torrent_name = info["name"]
-        path = info["save_path"]
+        path = info["save_path"] if \
+            info["move_on_completed_path"] == info["save_path"] else \
+            info["move_on_completed_path"]
+
         for command in self.config["commands"]:
             if command[EXECUTE_EVENT] == event:
                 command = os.path.expandvars(command[EXECUTE_COMMAND])