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
This commit is contained in:
Neil Booth 2015-11-29 23:14:40 +09:00
parent e302dbc71c
commit e190024f73

View file

@ -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