tMerge pull request #1151 from romanz/master - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit de5c9c2f836bf44e5441254c01dc328f69460a46
DIR parent 86adcb12cb14a2d58a4d380f44b18b9ed1c2d7c4
HTML Author: ThomasV <electrumdev@gmail.com>
Date: Thu, 23 Apr 2015 15:53:03 +0200
Merge pull request #1151 from romanz/master
Fix transaction broadcasting issues
Diffstat:
M gui/qt/main_window.py | 2 +-
M gui/qt/transaction_dialog.py | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -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():
t@@ -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]
DIR diff --git a/gui/qt/transaction_dialog.py b/gui/qt/transaction_dialog.py
t@@ -178,6 +178,7 @@ class TxDialog(QDialog):
# if we are not synchronized, we cannot tell
if self.parent.network is None or not self.parent.network.is_running() or not self.parent.network.is_connected():
+ self.broadcast_button.hide() # cannot broadcast when offline
return
if not self.wallet.up_to_date:
return