electrum

commit e190024f735fe9255d868e758f5092f9f2924524
parent e302dbc71c0d403661fb1718f6d3df59cde237db
Author: Neil Booth <kyuupichan@gmail.com>
Date:   Sun, 29 Nov 2015 23:14:40 +0900

Only pass a fixed fee if it was user-specified.

Otherwise we inadvertently fix the fee at the prior calculated one,
which isn't what we want

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

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -977,8 +977,9 @@ class ElectrumWindow(QMainWindow, PrintError):
 
         def on_shortcut():
             inputs = self.get_coins()
-            amount, fee = self.wallet.get_max_amount(self.config, inputs, self.fee_e.get_amount())
-            if self.fee_e.get_amount() is None:
+            fee = self.fee_e.get_amount() if self.fee_e.isModified() else None
+            amount, fee = self.wallet.get_max_amount(self.config, inputs, fee)
+            if not self.fee_e.isModified():
                 self.fee_e.setAmount(fee)
             self.amount_e.setAmount(max(0, amount))
             # emit signal for fiat_amount update