AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #1151 from romanz/master

Browse Source 
Fix transaction broadcasting issues
This commit is contained in:
ThomasV
2015-04-23 15:53:03 +02:00
parent 86adcb12cb b5c31cd031
commit de5c9c2f83
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/qt/main_window.py
View File

@@ -1163,7 +1163,6 @@ class ElectrumWindow(QMainWindow):
def broadcast_thread():
# non-GUI thread
pr = self.payment_request
key = pr.get_id()
if pr is None:
return self.wallet.sendtx(tx)
if pr.has_expired():
@@ -1172,6 +1171,7 @@ class ElectrumWindow(QMainWindow):
status, msg = self.wallet.sendtx(tx)
if not status:
return False, msg
key = pr.get_id()
self.invoices.set_paid(key, tx.hash())
self.payment_request = None
refund_address = self.wallet.addresses()[0]