AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #3810 from SomberNight/conflicting_txns

Browse Source 
conflicting transactions
This commit is contained in:
ThomasV
2018-02-06 06:16:19 +01:00
committed by GitHub
parent fca20e33f5 ca19a36478
commit d9cf4c2b63
4 changed files with 115 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gui/qt/transaction_dialog.py
View File

@@ -179,10 +179,13 @@ class TxDialog(QDialog, MessageBoxMixin):
self.main_window.sign_tx(self.tx, sign_done)
def save(self):
self.wallet.add_transaction(self.tx.txid(), self.tx)
if not self.wallet.add_transaction(self.tx.txid(), self.tx):
self.show_error(_("Transaction could not be saved. It conflicts with current history."))
return
self.wallet.save_transactions(write=True)
self.main_window.history_list.update()
# need to update at least: history_list, utxo_list, address_list
self.main_window.need_update.set()
self.save_button.setDisabled(True)
self.show_message(_("Transaction saved successfully"))