diff options
author | Andrew Resch <andrewresch@gmail.com> | 2009-12-17 21:40:21 +0000 |
---|---|---|
committer | Andrew Resch <andrewresch@gmail.com> | 2009-12-17 21:40:21 +0000 |
commit | 0663da4424e53d65e83f436a33696cbb23cf22ee (patch) | |
tree | 538f3dcf75b1ccb7130eb6c43cffe89fb8f40f61 | |
parent | 8c265bb308becabc4fd6ffa8780ffd830720af9a (diff) | |
download | deluge-0663da4424e53d65e83f436a33696cbb23cf22ee.tar.gz deluge-0663da4424e53d65e83f436a33696cbb23cf22ee.tar.bz2 deluge-0663da4424e53d65e83f436a33696cbb23cf22ee.zip |
Partial fix for #1103 if the per-torrent option for stopping at a ratio has been unchecked, then do
not stop it at the global setting.
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | deluge/core/torrentmanager.py | 4 |
2 files changed, 6 insertions, 0 deletions
@@ -49,6 +49,8 @@ * Fix the upload_plugin rpc method (was still using XML-RPC stuff) * Fix possible exception when upgrading from a 0.5 state file * Use metavar to modify the help output by optparse. + * Partial fix for #1103 if the per-torrent option for stopping at a ratio has + been unchecked, then do not stop it at the global setting. ==== Blocklist ==== * Fix blocklist not working for all locales diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index 108d27e8e..e65e26e7f 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -254,6 +254,10 @@ class TorrentManager(component.Component): def update(self): for torrent_id, torrent in self.torrents.items(): if self.config["stop_seed_at_ratio"] or torrent.options["stop_at_ratio"] and torrent.state not in ("Checking", "Allocating"): + # If the global setting is set, but the per-torrent isn't.. Just skip to the next torrent + # This is so that a user can turn-off the stop at ratio option on a per-torrent basis + if self.config["stop_seed_at_ratio"] and not torrent.options["stop_at_ratio"]: + continue stop_ratio = self.config["stop_seed_ratio"] if torrent.options["stop_at_ratio"]: stop_ratio = torrent.options["stop_ratio"] |