AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #4077

Browse Source
This commit is contained in:
SomberNight
2018-03-09 01:38:35 +01:00
parent b3bd166620
commit 6f0a7ff420
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/qt/transaction_dialog.py
View File

@@ -182,8 +182,8 @@ class TxDialog(QDialog, MessageBoxMixin):
if success: if success:
self.prompt_if_unsaved = True self.prompt_if_unsaved = True
self.saved = False self.saved = False
self.save_button.setDisabled(False) self.save_button.setDisabled(False)
self.save_button.setToolTip("") self.save_button.setToolTip("")
self.update() self.update()
self.main_window.pop_top_level_window(self) self.main_window.pop_top_level_window(self)

3
lib/wallet.py
View File

@@ -778,6 +778,9 @@ class Abstract_Wallet(PrintError):
return conflicting_txns return conflicting_txns
def add_transaction(self, tx_hash, tx): def add_transaction(self, tx_hash, tx):
assert tx_hash, tx_hash
assert tx, tx
assert tx.is_complete()
# we need self.transaction_lock but get_tx_height will take self.lock # we need self.transaction_lock but get_tx_height will take self.lock
# so we need to take that too here, to enforce order of locks # so we need to take that too here, to enforce order of locks
with self.lock, self.transaction_lock: with self.lock, self.transaction_lock: