summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Resch <andrewresch@gmail.com>2012-03-04 16:41:43 -0800
committerAndrew Resch <andrewresch@gmail.com>2012-03-04 16:41:43 -0800
commitbb89a355e581626c1927e9d6080432398aa560f2 (patch)
tree94dbb7e1282582351ce9a0f0ce94f5963c9ee9b5
parent954c0e2d4d4193778f93172aa3e5a197a172d52d (diff)
parent9ce738e39a70ded71140894ae9fe22b224e53273 (diff)
downloaddeluge-bb89a355e581626c1927e9d6080432398aa560f2.tar.gz
deluge-bb89a355e581626c1927e9d6080432398aa560f2.tar.bz2
deluge-bb89a355e581626c1927e9d6080432398aa560f2.zip
Merge branch '1.3-stable' of deluge-torrent.org:deluge into 1.3-stabledeluge-1.3.4
-rw-r--r--deluge/core/torrentmanager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 3dd316cb1..26717a7f4 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -448,7 +448,7 @@ class TorrentManager(component.Component):
handle = None
try:
if magnet:
- handle = lt.add_magnet_uri(self.session, magnet, add_torrent_params)
+ handle = lt.add_magnet_uri(self.session, utf8_encoded(magnet), add_torrent_params)
else:
handle = self.session.add_torrent(add_torrent_params)
except RuntimeError, e: