From afbeaa6b7d6bb58f5c6098daa6125a6d6489de71 Mon Sep 17 00:00:00 2001 From: John Garland Date: Sat, 26 Dec 2009 17:09:05 +0000 Subject: [PATCH] Fix torrent info name not being utf-8 decoded when root file/folder name is blank --- ChangeLog | 2 ++ deluge/core/torrent.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3452380c8..7f65786ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ * Change share ratio calculation to use the total done instead of the all time downloaded value. This change will make the share ratio calculation not use data downloaded in failed hash checks. + * Fix torrent info name not being utf-8 decoded when root file/folder name + is blank ==== GtkUI ==== * Fix #1104, #735 use path.utf-8 if available diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index 7cddf616c..fae494d5c 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -603,7 +603,7 @@ class Torrent: if self.handle.has_metadata(): name = self.torrent_info.file_at(0).path.split("/", 1)[0] if not name: - return self.torrent_info.name() + name = self.torrent_info.name() try: return name.decode("utf8", "ignore") except UnicodeDecodeError: