From 1864762a0a3af4f32ba7fc5994bcb51d76643da3 Mon Sep 17 00:00:00 2001
From: Peter Surda <surda@economicsofbitcoin.com>
Date: Mon, 1 Jan 2018 12:49:08 +0100
Subject: [PATCH] Apply bandwidth limits without restart

- also minor style fixes
---
 src/bitmessageqt/__init__.py       | 10 +++++-----
 src/network/asyncore_pollchoose.py |  4 ++--
 src/network/connectionpool.py      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index c731b469..e6ff0cd0 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -69,7 +69,7 @@ import queues
 import shutdown
 import state
 from statusbar import BMStatusBar
-import throttle
+from network.asyncore_pollchoose import set_rates
 from version import softwareVersion
 import sound
 
@@ -2288,16 +2288,16 @@ class MyForm(settingsmixin.SMainWindow):
                     int(float(self.settingsDialogInstance.ui.lineEditMaxDownloadRate.text()))))
                 BMConfigParser().set('bitmessagesettings', 'maxuploadrate', str(
                     int(float(self.settingsDialogInstance.ui.lineEditMaxUploadRate.text()))))
-            except:
+            except ValueError:
                 QMessageBox.about(self, _translate("MainWindow", "Number needed"), _translate(
                     "MainWindow", "Your maximum download and upload rate must be numbers. Ignoring what you typed."))
+            else:
+                set_rates(BMConfigParser().safeGetInt("bitmessagesettings", "maxdownloadrate"),
+                    BMConfigParser().safeGetInt("bitmessagesettings", "maxuploadrate"))
 
             BMConfigParser().set('bitmessagesettings', 'maxoutboundconnections', str(
                 int(float(self.settingsDialogInstance.ui.lineEditMaxOutboundConnections.text()))))
 
-            throttle.SendThrottle().resetLimit()
-            throttle.ReceiveThrottle().resetLimit()
-
             BMConfigParser().set('bitmessagesettings', 'namecoinrpctype',
                 self.settingsDialogInstance.getNamecoinType())
             BMConfigParser().set('bitmessagesettings', 'namecoinrpchost', str(
diff --git a/src/network/asyncore_pollchoose.py b/src/network/asyncore_pollchoose.py
index caa9d650..c5586a91 100644
--- a/src/network/asyncore_pollchoose.py
+++ b/src/network/asyncore_pollchoose.py
@@ -129,8 +129,8 @@ def write(obj):
 
 def set_rates(download, upload):
     global maxDownloadRate, maxUploadRate, downloadBucket, uploadBucket, downloadTimestamp, uploadTimestamp
-    maxDownloadRate = float(download)
-    maxUploadRate = float(upload)
+    maxDownloadRate = float(download) * 1024
+    maxUploadRate = float(upload) * 1024
     downloadBucket = maxDownloadRate
     uploadBucket = maxUploadRate
     downloadTimestamp = time.time()
diff --git a/src/network/connectionpool.py b/src/network/connectionpool.py
index 2f937a15..3b817e65 100644
--- a/src/network/connectionpool.py
+++ b/src/network/connectionpool.py
@@ -22,8 +22,8 @@ import state
 class BMConnectionPool(object):
     def __init__(self):
         asyncore.set_rates(
-                BMConfigParser().safeGetInt("bitmessagesettings", "maxdownloadrate") * 1024,
-                BMConfigParser().safeGetInt("bitmessagesettings", "maxuploadrate") * 1024)
+                BMConfigParser().safeGetInt("bitmessagesettings", "maxdownloadrate"),
+                BMConfigParser().safeGetInt("bitmessagesettings", "maxuploadrate"))
         self.outboundConnections = {}
         self.inboundConnections = {}
         self.listeningSockets = {}