From 5784b2adbb7688762a3253b27c3eb28a2fd3e89a Mon Sep 17 00:00:00 2001
From: Andrew Resch <andrewresch@gmail.com>
Date: Sat, 26 Jul 2008 03:50:10 +0000
Subject: [PATCH] Fix do not create torrentfiles folder unless
 'copy_torrent_file' is True Fix some libtorrent asserts when using debug
 build

---
 deluge/core/core.py    | 23 ++++++++++++++++-------
 deluge/core/torrent.py | 13 +++++++++++--
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/deluge/core/core.py b/deluge/core/core.py
index b3a290c18..ac98487a3 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -728,11 +728,11 @@ class Core(
         self.config_value_changed(key, value)
         
     def _on_set_torrentfiles_location(self, key, value):
-        # First try to create the new directory
-        try:
-            os.makedirs(value)
-        except Exception, e:
-            log.debug("Unable to make directory: %s", e)
+        if self.config["copy_torrent_file"]:
+            try:
+                os.makedirs(value)
+            except Exception, e:
+                log.debug("Unable to make directory: %s", e)
     
     def _on_set_state_location(self, key, value):
         if not os.access(value, os.F_OK):
@@ -845,12 +845,21 @@ class Core(
     def _on_set_max_upload_speed(self, key, value):
         log.debug("max_upload_speed set to %s..", value)
         # We need to convert Kb/s to B/s
-        self.session.set_upload_rate_limit(int(value * 1024))
+        if value < 0:
+            v = -1
+        else:
+            v = int(value * 1024)
+
+        self.session.set_upload_rate_limit(v)
 
     def _on_set_max_download_speed(self, key, value):
         log.debug("max_download_speed set to %s..", value)
         # We need to convert Kb/s to B/s
-        self.session.set_download_rate_limit(int(value * 1024))
+        if value < 0:
+            v = -1
+        else:
+            v = int(value * 1024)
+        self.session.set_download_rate_limit(v)
         
     def _on_set_max_upload_slots_global(self, key, value):
         log.debug("max_upload_slots_global set to %s..", value)
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 5b81705db..4bb953c46 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -151,11 +151,20 @@ class Torrent:
         
     def set_max_upload_speed(self, m_up_speed):
         self.max_upload_speed = m_up_speed
-        self.handle.set_upload_limit(int(m_up_speed * 1024))
+        if m_up_speed < 0:
+            v = -1
+        else:
+            v = int(m_up_speed * 1024)
+            
+        self.handle.set_upload_limit(v)
     
     def set_max_download_speed(self, m_down_speed):
         self.max_download_speed = m_down_speed
-        self.handle.set_download_limit(int(m_down_speed * 1024))
+        if m_down_speed < 0:
+            v = -1
+        else:
+            v = int(m_down_speed * 1024)
+        self.handle.set_download_limit(v)
     
     def set_prioritize_first_last(self, prioritize):
         self.prioritize_first_last = prioritize