Fix torrent name being blank when root folder is renamed to /

Update changelog (for previous commit as well)
This commit is contained in:
John Garland 2009-10-30 00:15:22 +00:00
commit 92afb8ab80
2 changed files with 4 additions and 0 deletions

View file

@ -1,6 +1,8 @@
=== Deluge 1.2.0_rc3 (In Development) === === Deluge 1.2.0_rc3 (In Development) ===
==== Core ==== ==== Core ====
* Fix #1047 move completed does not work if saving to non default path * 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 ==== ==== GtkUI ====
* replace & with & in the details tab to ensure there are no markup errors * replace & with & in the details tab to ensure there are no markup errors

View file

@ -608,6 +608,8 @@ class Torrent:
def ti_name(): def ti_name():
if self.handle.has_metadata(): if self.handle.has_metadata():
name = self.torrent_info.file_at(0).path.split("/", 1)[0] name = self.torrent_info.file_at(0).path.split("/", 1)[0]
if not name:
return self.torrent_info.name()
try: try:
return name.decode("utf8", "ignore") return name.decode("utf8", "ignore")
except UnicodeDecodeError: except UnicodeDecodeError: