electrum

commit 667bc59426c60ab5e6e640ce162738a2cfac26e2
parent 4eda748506851129e4d6e12628041c3db01d6744
Author: ThomasV <thomasv@gitorious>
Date:   Thu, 29 Jan 2015 11:06:46 +0100

fix check_for_disable in network window

Diffstat:
M
gui/qt/network_dialog.py
 | 
17
++++++++---------

1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/gui/qt/network_dialog.py b/gui/qt/network_dialog.py
@@ -143,19 +143,18 @@ class NetworkDialog(QDialog):
         self.proxy_mode.addItems(['NONE', 'SOCKS4', 'SOCKS5', 'HTTP'])
 
         def check_for_disable(index = False):
-            if self.proxy_mode.currentText() != 'NONE':
-                self.proxy_host.setEnabled(True)
-                self.proxy_port.setEnabled(True)
+            if self.config.is_modifiable('proxy'):
+                if self.proxy_mode.currentText() != 'NONE':
+                    self.proxy_host.setEnabled(True)
+                    self.proxy_port.setEnabled(True)
+                else:
+                    self.proxy_host.setEnabled(False)
+                    self.proxy_port.setEnabled(False)
             else:
-                self.proxy_host.setEnabled(False)
-                self.proxy_port.setEnabled(False)
+                for w in [self.proxy_host, self.proxy_port, self.proxy_mode]: w.setEnabled(False)
 
         check_for_disable()
         self.proxy_mode.connect(self.proxy_mode, SIGNAL('currentIndexChanged(int)'), check_for_disable)
-
-        if not self.config.is_modifiable('proxy'):
-            for w in [self.proxy_host, self.proxy_port, self.proxy_mode]: w.setEnabled(False)
-
         self.proxy_mode.setCurrentIndex(self.proxy_mode.findText(str(proxy_config.get("mode").upper())))
         self.proxy_host.setText(proxy_config.get("host"))
         self.proxy_port.setText(proxy_config.get("port"))