tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit a36ab7c814d9f35a492eafcbe5551e27e0566999
DIR parent 2e67ca43e84dd3a0cb6d10cd3851362acd4f7935
HTML Author: ThomasV <thomasv@gitorious>
Date: Fri, 29 May 2015 19:27:16 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M gui/qt/main_window.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -1299,6 +1299,7 @@ class ElectrumWindow(QMainWindow):
elif addr not in self.wallet.frozen_addresses and freeze:
self.wallet.freeze(addr)
self.update_address_tab()
+ self.update_fee(False)
def create_list_tab(self, l):
w = QWidget()
t@@ -2499,7 +2500,7 @@ class ElectrumWindow(QMainWindow):
if not self.config.is_modifiable('fee_per_kb'):
for w in [fee_e, fee_label]: w.setEnabled(False)
def on_fee(is_done):
- self.wallet.set_fee(fee_e.get_amount(), is_done)
+ self.wallet.set_fee(fee_e.get_amount() or 0, is_done)
if not is_done:
self.update_fee(False)
fee_e.editingFinished.connect(lambda: on_fee(True))