summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Resch <andrewresch@gmail.com>2009-12-17 21:27:04 +0000
committerAndrew Resch <andrewresch@gmail.com>2009-12-17 21:27:04 +0000
commit8c265bb308becabc4fd6ffa8780ffd830720af9a (patch)
tree5c5b7e8bb3cad848ff8879ced679030e8781d35e
parentfe6c89a2e10f5080a17731f1fa3a548e3622180b (diff)
downloaddeluge-8c265bb308becabc4fd6ffa8780ffd830720af9a.tar.gz
deluge-8c265bb308becabc4fd6ffa8780ffd830720af9a.tar.bz2
deluge-8c265bb308becabc4fd6ffa8780ffd830720af9a.zip
Fix #1095 incorrect piece size used when using some non-English languages
-rw-r--r--ChangeLog1
-rw-r--r--deluge/ui/gtkui/createtorrentdialog.py10
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b417b1ecb..42ed4d3e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,7 @@
* Made the password dialog prettier
* Fix #1086 deprecated gtk.Tooltips usage
* Fix #768 save tracker list for create torrent dialog
+ * Fix #1095 incorrect piece size used when using some non-English languages
==== Console ====
* Fix using the console in Windows, but only in command-line mode
diff --git a/deluge/ui/gtkui/createtorrentdialog.py b/deluge/ui/gtkui/createtorrentdialog.py
index 7fcc18345..0cd3a534f 100644
--- a/deluge/ui/gtkui/createtorrentdialog.py
+++ b/deluge/ui/gtkui/createtorrentdialog.py
@@ -115,9 +115,13 @@ class CreateTorrentDialog:
def parse_piece_size_text(self, value):
psize, metric = value.split()
- psize = int(psize) * 1024
- if metric[0] == 'M':
- psize *= 1024
+ psize = int(psize)
+ if psize < 32:
+ # This is a MiB value
+ psize = psize * 1024 * 1024
+ else:
+ # This is a KiB value
+ psize = psize * 1024
return psize