LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-01 01:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gui/qt/main_window.py
View file

@ -977,8 +977,9 @@ class ElectrumWindow(QMainWindow, PrintError):
def on_shortcut(): def on_shortcut():
inputs = self.get_coins() inputs = self.get_coins()
amount, fee = self.wallet.get_max_amount(self.config, inputs, self.fee_e.get_amount()) fee = self.fee_e.get_amount() if self.fee_e.isModified() else None
if self.fee_e.get_amount() is None: amount, fee = self.wallet.get_max_amount(self.config, inputs, fee)
if not self.fee_e.isModified():
self.fee_e.setAmount(fee) self.fee_e.setAmount(fee)
self.amount_e.setAmount(max(0, amount)) self.amount_e.setAmount(max(0, amount))
# emit signal for fiat_amount update # emit signal for fiat_amount update