electrum

commit 1a9e768e318b9aff6261763b03f665a04edf1a0c
parent 94ecf8dd7d0197646e6bc2b7d47c256a3132855b
Author: ThomasV <thomasv@gitorious>
Date:   Thu, 13 Aug 2015 15:19:34 +0200

fix dynamic fee slider behaviour in OSX

Diffstat:
M
gui/qt/main_window.py
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -2597,15 +2597,16 @@ class ElectrumWindow(QMainWindow):
         gui_widgets.append((nz_label, nz))
 
         msg = _('Fee per kilobyte of transaction.') + '\n' \
-              + _('If you enable dynamic fees, and this parameter will be used as upper bound.')
+              + _('If you enable dynamic fees, this parameter will be used as upper bound.')
         fee_label = HelpLabel(_('Transaction fee per kb') + ':', msg)
         fee_e = BTCkBEdit(self.get_decimal_point)
         fee_e.setAmount(self.config.get('fee_per_kb', bitcoin.RECOMMENDED_FEE))
         def on_fee(is_done):
+            if self.config.get('dynamic_fees'):
+                return
             v = fee_e.get_amount() or 0
             self.config.set_key('fee_per_kb', v, is_done)
-            if not is_done:
-                self.update_fee()
+            self.update_fee()
         fee_e.editingFinished.connect(lambda: on_fee(True))
         fee_e.textEdited.connect(lambda: on_fee(False))
         tx_widgets.append((fee_label, fee_e))