From 92afb8ab80611ac64c14a73c3fadabae63982471 Mon Sep 17 00:00:00 2001 From: John Garland Date: Fri, 30 Oct 2009 00:15:22 +0000 Subject: [PATCH] Fix torrent name being blank when root folder is renamed to / Update changelog (for previous commit as well) --- ChangeLog | 2 ++ deluge/core/torrent.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 31b8ee216..dc0d2c9cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ === Deluge 1.2.0_rc3 (In Development) === ==== Core ==== * Fix #1047 move completed does not work if saving to non default path + * Fix renamed files not being utf-8 encoded + * Fix torrent name being blank when renaming root folder to / ==== GtkUI ==== * replace & with & in the details tab to ensure there are no markup errors diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py index a9e621f82..a6984467f 100644 --- a/deluge/core/torrent.py +++ b/deluge/core/torrent.py @@ -608,6 +608,8 @@ class Torrent: def ti_name(): if self.handle.has_metadata(): name = self.torrent_info.file_at(0).path.split("/", 1)[0] + if not name: + return self.torrent_info.name() try: return name.decode("utf8", "ignore") except UnicodeDecodeError: